diff --git a/Packages/com.unity.formats.fbx/Runtime/FbxPrefab.cs b/Packages/com.unity.formats.fbx/Runtime/FbxPrefab.cs
index df5cdfdc1..19b8e5250 100644
--- a/Packages/com.unity.formats.fbx/Runtime/FbxPrefab.cs
+++ b/Packages/com.unity.formats.fbx/Runtime/FbxPrefab.cs
@@ -3,6 +3,24 @@
 
 namespace UnityEngine.Formats.Fbx.Exporter
 {
+    [System.Serializable]
+    public struct StringPair {
+        private string m_fbxObjectName;
+        public string FBXObjectName
+        {
+            get { return m_fbxObjectName; }
+            set { m_fbxObjectName = value; }
+        }
+        private string m_unityObjectName;
+        public string UnityObjectName
+        {
+            get { return m_unityObjectName; }
+            set { m_unityObjectName = value; }
+        }
+    }
+
+    public delegate void HandleUpdate(FbxPrefab updatedInstance, IEnumerable<GameObject> updatedObjects);
+
     /// <summary>
     /// This component is applied to a prefab. It keeps the prefab sync'd up
     /// with an FBX file.
@@ -24,22 +42,6 @@ public class FbxPrefab : MonoBehaviour
         [SerializeField] // [HideInInspector]
         string m_fbxHistory;
 
-        [System.Serializable]
-        public struct StringPair {
-            private string m_fbxObjectName;
-            public string FBXObjectName
-            {
-                get { return m_fbxObjectName; }
-                set { m_fbxObjectName = value; }
-            }
-            private string m_unityObjectName;
-            public string UnityObjectName
-            {
-                get { return m_unityObjectName; }
-                set { m_unityObjectName = value; }
-            }
-        }
-
         [SerializeField]
         List<StringPair> m_nameMapping = new List<StringPair>();
 
@@ -111,7 +113,6 @@ public bool AutoUpdate {
         /// - had a component that was created, destroyed, or updated.
         /// There is no notification for entire objects that were destroyed.
         /// </summary>
-        public delegate void HandleUpdate(FbxPrefab updatedInstance, IEnumerable<GameObject> updatedObjects);
 
         /// <summary>
         /// OnUpdate is raised once when an FbxPrefab gets updated, after all the changes