diff --git a/EFI/OC/Kexts/AppleALC/Contents/Info.plist b/EFI/OC/Kexts/AppleALC.kext/Contents/Info.plist
similarity index 100%
rename from EFI/OC/Kexts/AppleALC/Contents/Info.plist
rename to EFI/OC/Kexts/AppleALC.kext/Contents/Info.plist
diff --git a/EFI/OC/Kexts/AppleALC/Contents/MacOS/AppleALC b/EFI/OC/Kexts/AppleALC.kext/Contents/MacOS/AppleALC
similarity index 100%
rename from EFI/OC/Kexts/AppleALC/Contents/MacOS/AppleALC
rename to EFI/OC/Kexts/AppleALC.kext/Contents/MacOS/AppleALC
diff --git a/EFI/OC/Kexts/Lilu/Contents/Info.plist b/EFI/OC/Kexts/Lilu.kext/Contents/Info.plist
similarity index 100%
rename from EFI/OC/Kexts/Lilu/Contents/Info.plist
rename to EFI/OC/Kexts/Lilu.kext/Contents/Info.plist
diff --git a/EFI/OC/Kexts/Lilu/Contents/MacOS/Lilu b/EFI/OC/Kexts/Lilu.kext/Contents/MacOS/Lilu
similarity index 100%
rename from EFI/OC/Kexts/Lilu/Contents/MacOS/Lilu
rename to EFI/OC/Kexts/Lilu.kext/Contents/MacOS/Lilu
diff --git a/EFI/OC/Kexts/SMCBatteryManager/Contents/Info.plist b/EFI/OC/Kexts/SMCBatteryManager.kext/Contents/Info.plist
similarity index 100%
rename from EFI/OC/Kexts/SMCBatteryManager/Contents/Info.plist
rename to EFI/OC/Kexts/SMCBatteryManager.kext/Contents/Info.plist
diff --git a/EFI/OC/Kexts/SMCBatteryManager/Contents/MacOS/SMCBatteryManager b/EFI/OC/Kexts/SMCBatteryManager.kext/Contents/MacOS/SMCBatteryManager
similarity index 100%
rename from EFI/OC/Kexts/SMCBatteryManager/Contents/MacOS/SMCBatteryManager
rename to EFI/OC/Kexts/SMCBatteryManager.kext/Contents/MacOS/SMCBatteryManager
diff --git a/EFI/OC/Kexts/SMCBatteryManager/Contents/Resources/SSDT-BATC.dsl b/EFI/OC/Kexts/SMCBatteryManager.kext/Contents/Resources/SSDT-BATC.dsl
similarity index 100%
rename from EFI/OC/Kexts/SMCBatteryManager/Contents/Resources/SSDT-BATC.dsl
rename to EFI/OC/Kexts/SMCBatteryManager.kext/Contents/Resources/SSDT-BATC.dsl
diff --git a/EFI/OC/Kexts/SMCDellSensors/Contents/Info.plist b/EFI/OC/Kexts/SMCDellSensors.kext/Contents/Info.plist
similarity index 100%
rename from EFI/OC/Kexts/SMCDellSensors/Contents/Info.plist
rename to EFI/OC/Kexts/SMCDellSensors.kext/Contents/Info.plist
diff --git a/EFI/OC/Kexts/SMCDellSensors/Contents/MacOS/SMCDellSensors b/EFI/OC/Kexts/SMCDellSensors.kext/Contents/MacOS/SMCDellSensors
similarity index 100%
rename from EFI/OC/Kexts/SMCDellSensors/Contents/MacOS/SMCDellSensors
rename to EFI/OC/Kexts/SMCDellSensors.kext/Contents/MacOS/SMCDellSensors
diff --git a/EFI/OC/Kexts/SMCLightSensor/Contents/Info.plist b/EFI/OC/Kexts/SMCLightSensor.kext/Contents/Info.plist
similarity index 100%
rename from EFI/OC/Kexts/SMCLightSensor/Contents/Info.plist
rename to EFI/OC/Kexts/SMCLightSensor.kext/Contents/Info.plist
diff --git a/EFI/OC/Kexts/SMCLightSensor/Contents/MacOS/SMCLightSensor b/EFI/OC/Kexts/SMCLightSensor.kext/Contents/MacOS/SMCLightSensor
similarity index 100%
rename from EFI/OC/Kexts/SMCLightSensor/Contents/MacOS/SMCLightSensor
rename to EFI/OC/Kexts/SMCLightSensor.kext/Contents/MacOS/SMCLightSensor
diff --git a/EFI/OC/Kexts/SMCProcessor/Contents/Info.plist b/EFI/OC/Kexts/SMCProcessor.kext/Contents/Info.plist
similarity index 100%
rename from EFI/OC/Kexts/SMCProcessor/Contents/Info.plist
rename to EFI/OC/Kexts/SMCProcessor.kext/Contents/Info.plist
diff --git a/EFI/OC/Kexts/SMCProcessor/Contents/MacOS/SMCProcessor b/EFI/OC/Kexts/SMCProcessor.kext/Contents/MacOS/SMCProcessor
similarity index 100%
rename from EFI/OC/Kexts/SMCProcessor/Contents/MacOS/SMCProcessor
rename to EFI/OC/Kexts/SMCProcessor.kext/Contents/MacOS/SMCProcessor
diff --git a/EFI/OC/Kexts/SMCSuperIO/Contents/Info.plist b/EFI/OC/Kexts/SMCSuperIO.kext/Contents/Info.plist
similarity index 100%
rename from EFI/OC/Kexts/SMCSuperIO/Contents/Info.plist
rename to EFI/OC/Kexts/SMCSuperIO.kext/Contents/Info.plist
diff --git a/EFI/OC/Kexts/SMCSuperIO/Contents/MacOS/SMCSuperIO b/EFI/OC/Kexts/SMCSuperIO.kext/Contents/MacOS/SMCSuperIO
similarity index 100%
rename from EFI/OC/Kexts/SMCSuperIO/Contents/MacOS/SMCSuperIO
rename to EFI/OC/Kexts/SMCSuperIO.kext/Contents/MacOS/SMCSuperIO
diff --git a/EFI/OC/Kexts/USBToolBox.kext/Contents/Info.plist b/EFI/OC/Kexts/USBToolBox.kext/Contents/Info.plist
new file mode 100644
index 0000000..83572d5
--- /dev/null
+++ b/EFI/OC/Kexts/USBToolBox.kext/Contents/Info.plist
@@ -0,0 +1,63 @@
+<?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>20G527</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>USBToolBox</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.dhinakg.USBToolBox.kext</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>USBToolBox</string>
+	<key>CFBundlePackageType</key>
+	<string>KEXT</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1.1.1</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>12E507</string>
+	<key>DTPlatformName</key>
+	<string>macosx</string>
+	<key>DTPlatformVersion</key>
+	<string>11.3</string>
+	<key>DTSDKBuild</key>
+	<string>20E214</string>
+	<key>DTSDKName</key>
+	<string>macosx11.3</string>
+	<key>DTXcode</key>
+	<string>1251</string>
+	<key>DTXcodeBuild</key>
+	<string>12E507</string>
+	<key>IOKitPersonalities</key>
+	<dict/>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.11</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2020-2021 Dhinak G. All rights reserved.</string>
+	<key>OSBundleCompatibleVersion</key>
+	<string>1.0.0</string>
+	<key>OSBundleLibraries</key>
+	<dict>
+		<key>com.apple.driver.AppleUSBHostMergeProperties</key>
+		<string>1.0</string>
+		<key>com.apple.iokit.IOPCIFamily</key>
+		<string>2.9</string>
+		<key>com.apple.kpi.iokit</key>
+		<string>15.0.0</string>
+		<key>com.apple.kpi.libkern</key>
+		<string>15.0.0</string>
+	</dict>
+	<key>OSBundleRequired</key>
+	<string>Root</string>
+</dict>
+</plist>
diff --git a/EFI/OC/Kexts/USBToolBox.kext/Contents/MacOS/USBToolBox b/EFI/OC/Kexts/USBToolBox.kext/Contents/MacOS/USBToolBox
new file mode 100644
index 0000000..c4547fb
Binary files /dev/null and b/EFI/OC/Kexts/USBToolBox.kext/Contents/MacOS/USBToolBox differ
diff --git a/EFI/OC/Kexts/UTBDefault.kext/Contents/Info.plist b/EFI/OC/Kexts/UTBDefault.kext/Contents/Info.plist
new file mode 100644
index 0000000..8a31654
--- /dev/null
+++ b/EFI/OC/Kexts/UTBDefault.kext/Contents/Info.plist
@@ -0,0 +1,47 @@
+<?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>CFBundleGetInfoString</key>
+	<string>v1.0</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.dhinakg.USBToolBox.injector</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>UTBMap</string>
+	<key>CFBundlePackageType</key>
+	<string>KEXT</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>IOKitPersonalities</key>
+	<dict>
+		<key>XHC1</key>
+		<dict>
+			<key>CFBundleIdentifier</key>
+			<string>com.dhinakg.USBToolBox.kext</string>
+			<key>IOClass</key>
+			<string>USBToolBox</string>
+			<key>IOMatchCategory</key>
+			<string>USBToolBox</string>
+			<key>IOPCIClassMatch</key>
+			<string>0x0c030000&amp;0xffff0000</string>
+			<key>IOProviderClass</key>
+			<string>IOPCIDevice</string>
+		</dict>
+	</dict>
+	<key>OSBundleLibraries</key>
+	<dict>
+		<key>com.dhinakg.USBToolBox.kext</key>
+		<string>1.0.0</string>
+	</dict>
+	<key>OSBundleRequired</key>
+	<string>Root</string>
+</dict>
+</plist>
diff --git a/EFI/OC/Kexts/VirtualSMC/Contents/Info.plist b/EFI/OC/Kexts/VirtualSMC.kext/Contents/Info.plist
similarity index 100%
rename from EFI/OC/Kexts/VirtualSMC/Contents/Info.plist
rename to EFI/OC/Kexts/VirtualSMC.kext/Contents/Info.plist
diff --git a/EFI/OC/Kexts/VirtualSMC/Contents/MacOS/VirtualSMC b/EFI/OC/Kexts/VirtualSMC.kext/Contents/MacOS/VirtualSMC
similarity index 100%
rename from EFI/OC/Kexts/VirtualSMC/Contents/MacOS/VirtualSMC
rename to EFI/OC/Kexts/VirtualSMC.kext/Contents/MacOS/VirtualSMC
diff --git a/EFI/OC/Kexts/WhateverGreen/Contents/Info.plist b/EFI/OC/Kexts/WhateverGreen.kext/Contents/Info.plist
similarity index 100%
rename from EFI/OC/Kexts/WhateverGreen/Contents/Info.plist
rename to EFI/OC/Kexts/WhateverGreen.kext/Contents/Info.plist
diff --git a/EFI/OC/Kexts/WhateverGreen/Contents/MacOS/WhateverGreen b/EFI/OC/Kexts/WhateverGreen.kext/Contents/MacOS/WhateverGreen
similarity index 100%
rename from EFI/OC/Kexts/WhateverGreen/Contents/MacOS/WhateverGreen
rename to EFI/OC/Kexts/WhateverGreen.kext/Contents/MacOS/WhateverGreen