diff --git a/AAC/AACCore/Template.meta b/AAC/Template.meta
similarity index 100%
rename from AAC/AACCore/Template.meta
rename to AAC/Template.meta
diff --git a/AAC/AACCore/Template/Template.cs b/AAC/Template/Template.cs
similarity index 100%
rename from AAC/AACCore/Template/Template.cs
rename to AAC/Template/Template.cs
diff --git a/AAC/AACCore/Template/Template.cs.meta b/AAC/Template/Template.cs.meta
similarity index 100%
rename from AAC/AACCore/Template/Template.cs.meta
rename to AAC/Template/Template.cs.meta
diff --git a/AAC/AACCore/Template/TemplateAAC.asmdef b/AAC/Template/TemplateAAC.asmdef
similarity index 100%
rename from AAC/AACCore/Template/TemplateAAC.asmdef
rename to AAC/Template/TemplateAAC.asmdef
diff --git a/AAC/AACCore/Template/TemplateAAC.asmdef.meta b/AAC/Template/TemplateAAC.asmdef.meta
similarity index 100%
rename from AAC/AACCore/Template/TemplateAAC.asmdef.meta
rename to AAC/Template/TemplateAAC.asmdef.meta
diff --git a/Common/Runtime/ComponentHelper.cs b/Common/Runtime/ComponentHelper.cs
index 2ed7203..5189578 100644
--- a/Common/Runtime/ComponentHelper.cs
+++ b/Common/Runtime/ComponentHelper.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using UnityEngine;
 
 namespace gay.lilyy.Common
@@ -41,7 +42,7 @@ namespace gay.lilyy.Common
         {
             if (root == null) return null;
 
-            T[] components = root.GetComponentsInChildren<T>(true);
+            T[] components = root.GetComponentsInChildren<T>(true).Concat(root.GetComponents<T>()).ToArray();
             if (components.Length == 0)
             {
                 return null;