diff --git a/Assets/Stickers/Editor/StickerEditor.cs b/Assets/Stickers/Editor/StickerEditor.cs
index 80c1993..97b0a8a 100644
--- a/Assets/Stickers/Editor/StickerEditor.cs
+++ b/Assets/Stickers/Editor/StickerEditor.cs
@@ -1,15 +1,15 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using UnityEditor;
 using UnityEngine;
+using Agens.Stickers;
 
-namespace Agens.Stickers
+namespace Agens.StickersEditor
 {
     [CustomEditor(typeof(Sticker))]
-    public class StickerEditor : UnityEditor.Editor
+    public class StickerEditor : Editor
     {
         private SerializedProperty Frames;
         private SerializedProperty Sequence;
@@ -19,12 +19,12 @@ public class StickerEditor : UnityEditor.Editor
 
         private static GUIContent[] s_PlayIcons = new GUIContent[2];
 
-        private List<UnityEditor.Editor> textureEditors;
+        private List<Editor> textureEditors;
 
         private MethodInfo RepaintMethod;
         private object GUIView;
 
-        private UnityEditor.Editor currentTextureEditor
+        private Editor currentTextureEditor
         {
             get
             {
@@ -173,7 +173,7 @@ public override void OnInteractivePreviewGUI(Rect r, GUIStyle background)
             {
                 if (RepaintMethod == null)
                 {
-                    var type = typeof(UnityEditor.Editor).Assembly.GetType("UnityEditor.GUIView");
+                    var type = typeof(Editor).Assembly.GetType("UnityEditor.GUIView");
                     var prop = type.GetProperty("current", BindingFlags.Static | BindingFlags.Public);
                     GUIView = prop.GetValue(null, null);
                     RepaintMethod = GUIView.GetType().GetMethod("Repaint", BindingFlags.Public | BindingFlags.Instance);
@@ -203,7 +203,7 @@ private void CreateTextureEditor()
         {
             var sticker = serializedObject;
             var frames = sticker.FindProperty("Frames");
-            textureEditors = new List<UnityEditor.Editor>(frames.arraySize);
+            textureEditors = new List<Editor>(frames.arraySize);
             for (int i = 0; i < frames.arraySize; i++)
             {
                 var firstFrame = frames.GetArrayElementAtIndex(i);
diff --git a/Assets/Stickers/Editor/StickerEditorUtility.cs b/Assets/Stickers/Editor/StickerEditorUtility.cs
index bd76a13..b6f8f7b 100644
--- a/Assets/Stickers/Editor/StickerEditorUtility.cs
+++ b/Assets/Stickers/Editor/StickerEditorUtility.cs
@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace Agens.Stickers
+namespace Agens.StickersEditor
 {
     public static class StickerEditorUtility
     {
diff --git a/Assets/Stickers/Editor/StickerPackEditor.cs b/Assets/Stickers/Editor/StickerPackEditor.cs
index 448ff31..c51c655 100644
--- a/Assets/Stickers/Editor/StickerPackEditor.cs
+++ b/Assets/Stickers/Editor/StickerPackEditor.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -7,15 +6,16 @@
 using UnityEditor.AnimatedValues;
 using UnityEditorInternal;
 using UnityEngine;
+using Agens.Stickers;
 using Object = UnityEngine.Object;
 #if UNITY_5_5_OR_NEWER
 using UnityEngine.Profiling;
 #endif
 
-namespace Agens.Stickers
+namespace Agens.StickersEditor
 {
     [CustomEditor(typeof(StickerPack))]
-    public class StickerPackEditor : UnityEditor.Editor
+    public class StickerPackEditor : Editor
     {
 
         public static readonly int[] ValidSizes = new int[3] {300, 408, 618};
@@ -648,7 +648,7 @@ private void RepaintView()
         {
             if (repaintMethod == null)
             {
-                var type = typeof(UnityEditor.Editor).Assembly.GetType("UnityEditor.GUIView");
+                var type = typeof(Editor).Assembly.GetType("UnityEditor.GUIView");
                 var prop = type.GetProperty("current", BindingFlags.Static | BindingFlags.Public);
                 guiView = prop.GetValue(null, null);
                 repaintMethod = guiView.GetType().GetMethod("Repaint", BindingFlags.Public | BindingFlags.Instance);
diff --git a/Assets/Stickers/Editor/StickerTest.cs b/Assets/Stickers/Editor/StickerTest.cs
index ac9b92b..5032954 100644
--- a/Assets/Stickers/Editor/StickerTest.cs
+++ b/Assets/Stickers/Editor/StickerTest.cs
@@ -1,10 +1,8 @@
-using System.IO;
-using Agens;
-using UnityEngine;
-using UnityEditor;
+using UnityEditor;
 using NUnit.Framework;
+using Agens.Stickers;
 
-namespace Agens.Stickers
+namespace Agens.StickersEditor
 {
     public class StickerTest
     {
diff --git a/Assets/Stickers/Editor/StickersBuildPostProcess.cs b/Assets/Stickers/Editor/StickersBuildPostProcess.cs
index f93e58a..187b6ab 100644
--- a/Assets/Stickers/Editor/StickersBuildPostProcess.cs
+++ b/Assets/Stickers/Editor/StickersBuildPostProcess.cs
@@ -1,7 +1,7 @@
 using UnityEditor;
 using UnityEditor.Callbacks;
 
-namespace Agens.Stickers
+namespace Agens.StickersEditor
 {
     public class StickersBuildPostprocessor
     {
diff --git a/Assets/Stickers/Editor/StickersExport.cs b/Assets/Stickers/Editor/StickersExport.cs
index facaac7..dc03b4f 100644
--- a/Assets/Stickers/Editor/StickersExport.cs
+++ b/Assets/Stickers/Editor/StickersExport.cs
@@ -3,10 +3,11 @@
 using System.IO;
 using System.Linq;
 using UnityEditor;
-using UnityEditor.iOS.Xcode.Stickers;
+using Agens.Stickers;
+using Agens.StickersEditor.UnityEditor.iOS.Xcode;
 using Application = UnityEngine.Application;
 
-namespace Agens.Stickers
+namespace Agens.StickersEditor
 {
     public static class StickersExport
     {
diff --git a/Assets/Stickers/Editor/Xcode.meta b/Assets/Stickers/Editor/Xcode.meta
new file mode 100644
index 0000000..117ad88
--- /dev/null
+++ b/Assets/Stickers/Editor/Xcode.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 198e1f0ae4ed7504bb7bac2393595c71
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Stickers/Editor/AssetCatalog.cs b/Assets/Stickers/Editor/Xcode/AssetCatalog.cs
similarity index 99%
rename from Assets/Stickers/Editor/AssetCatalog.cs
rename to Assets/Stickers/Editor/Xcode/AssetCatalog.cs
index a15247c..1fc0b9f 100644
--- a/Assets/Stickers/Editor/AssetCatalog.cs
+++ b/Assets/Stickers/Editor/Xcode/AssetCatalog.cs
@@ -3,7 +3,7 @@
 using System.IO;
 using System.Linq;
 
-namespace UnityEditor.iOS.Xcode.Stickers
+namespace Agens.StickersEditor.UnityEditor.iOS.Xcode
 {
 	internal class DeviceTypeRequirement
     {
diff --git a/Assets/Stickers/Editor/AssetCatalog.cs.meta b/Assets/Stickers/Editor/Xcode/AssetCatalog.cs.meta
similarity index 100%
rename from Assets/Stickers/Editor/AssetCatalog.cs.meta
rename to Assets/Stickers/Editor/Xcode/AssetCatalog.cs.meta
diff --git a/Assets/Stickers/Editor/JsonParser.cs b/Assets/Stickers/Editor/Xcode/JsonParser.cs
similarity index 99%
rename from Assets/Stickers/Editor/JsonParser.cs
rename to Assets/Stickers/Editor/Xcode/JsonParser.cs
index eeb5239..615e3dc 100644
--- a/Assets/Stickers/Editor/JsonParser.cs
+++ b/Assets/Stickers/Editor/Xcode/JsonParser.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Linq;
 
-namespace UnityEditor.iOS.Xcode.Stickers
+namespace Agens.StickersEditor.UnityEditor.iOS.Xcode
 {
     public class JsonElement
     {
diff --git a/Assets/Stickers/Editor/JsonParser.cs.meta b/Assets/Stickers/Editor/Xcode/JsonParser.cs.meta
similarity index 100%
rename from Assets/Stickers/Editor/JsonParser.cs.meta
rename to Assets/Stickers/Editor/Xcode/JsonParser.cs.meta
diff --git a/Assets/Stickers/Editor/PBX.meta b/Assets/Stickers/Editor/Xcode/PBX.meta
similarity index 100%
rename from Assets/Stickers/Editor/PBX.meta
rename to Assets/Stickers/Editor/Xcode/PBX.meta
diff --git a/Assets/Stickers/Editor/PBX/Elements.cs b/Assets/Stickers/Editor/Xcode/PBX/Elements.cs
similarity index 97%
rename from Assets/Stickers/Editor/PBX/Elements.cs
rename to Assets/Stickers/Editor/Xcode/PBX/Elements.cs
index e749cea..35011f5 100644
--- a/Assets/Stickers/Editor/PBX/Elements.cs
+++ b/Assets/Stickers/Editor/Xcode/PBX/Elements.cs
@@ -2,7 +2,7 @@
 using System.Collections;
 using System;
 
-namespace UnityEditor.iOS.Xcode.PBX
+namespace Agens.StickersEditor.UnityEditor.iOS.Xcode.PBX
 {
     class PBXElement
     {
diff --git a/Assets/Stickers/Editor/PBX/Elements.cs.meta b/Assets/Stickers/Editor/Xcode/PBX/Elements.cs.meta
similarity index 100%
rename from Assets/Stickers/Editor/PBX/Elements.cs.meta
rename to Assets/Stickers/Editor/Xcode/PBX/Elements.cs.meta
diff --git a/Assets/Stickers/Editor/PBX/Lexer.cs b/Assets/Stickers/Editor/Xcode/PBX/Lexer.cs
similarity index 99%
rename from Assets/Stickers/Editor/PBX/Lexer.cs
rename to Assets/Stickers/Editor/Xcode/PBX/Lexer.cs
index e948bfe..8a224af 100644
--- a/Assets/Stickers/Editor/PBX/Lexer.cs
+++ b/Assets/Stickers/Editor/Xcode/PBX/Lexer.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System;
 
-namespace UnityEditor.iOS.Xcode.PBX
+namespace Agens.StickersEditor.UnityEditor.iOS.Xcode.PBX
 {
     enum TokenType
     {
diff --git a/Assets/Stickers/Editor/PBX/Lexer.cs.meta b/Assets/Stickers/Editor/Xcode/PBX/Lexer.cs.meta
similarity index 100%
rename from Assets/Stickers/Editor/PBX/Lexer.cs.meta
rename to Assets/Stickers/Editor/Xcode/PBX/Lexer.cs.meta
diff --git a/Assets/Stickers/Editor/PBX/Objects.cs b/Assets/Stickers/Editor/Xcode/PBX/Objects.cs
similarity index 99%
rename from Assets/Stickers/Editor/PBX/Objects.cs
rename to Assets/Stickers/Editor/Xcode/PBX/Objects.cs
index fc55bd5..767fb86 100644
--- a/Assets/Stickers/Editor/PBX/Objects.cs
+++ b/Assets/Stickers/Editor/Xcode/PBX/Objects.cs
@@ -5,7 +5,7 @@
 using System.Linq;
 using System;
 
-namespace UnityEditor.iOS.Xcode.PBX
+namespace Agens.StickersEditor.UnityEditor.iOS.Xcode.PBX
 {
     internal class PBXObjectData
     {   
diff --git a/Assets/Stickers/Editor/PBX/Objects.cs.meta b/Assets/Stickers/Editor/Xcode/PBX/Objects.cs.meta
similarity index 100%
rename from Assets/Stickers/Editor/PBX/Objects.cs.meta
rename to Assets/Stickers/Editor/Xcode/PBX/Objects.cs.meta
diff --git a/Assets/Stickers/Editor/PBX/Parser.cs b/Assets/Stickers/Editor/Xcode/PBX/Parser.cs
similarity index 98%
rename from Assets/Stickers/Editor/PBX/Parser.cs
rename to Assets/Stickers/Editor/Xcode/PBX/Parser.cs
index db35c96..e79a69c 100644
--- a/Assets/Stickers/Editor/PBX/Parser.cs
+++ b/Assets/Stickers/Editor/Xcode/PBX/Parser.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System;
 
-namespace UnityEditor.iOS.Xcode.PBX
+namespace Agens.StickersEditor.UnityEditor.iOS.Xcode.PBX
 {
     class ValueAST {}
 
diff --git a/Assets/Stickers/Editor/PBX/Parser.cs.meta b/Assets/Stickers/Editor/Xcode/PBX/Parser.cs.meta
similarity index 100%
rename from Assets/Stickers/Editor/PBX/Parser.cs.meta
rename to Assets/Stickers/Editor/Xcode/PBX/Parser.cs.meta
diff --git a/Assets/Stickers/Editor/PBX/Sections.cs b/Assets/Stickers/Editor/Xcode/PBX/Sections.cs
similarity index 98%
rename from Assets/Stickers/Editor/PBX/Sections.cs
rename to Assets/Stickers/Editor/Xcode/PBX/Sections.cs
index dc029d6..1f6e705 100644
--- a/Assets/Stickers/Editor/PBX/Sections.cs
+++ b/Assets/Stickers/Editor/Xcode/PBX/Sections.cs
@@ -7,7 +7,7 @@
 
 // Basr classes for section handling
 
-namespace UnityEditor.iOS.Xcode.PBX
+namespace Agens.StickersEditor.UnityEditor.iOS.Xcode.PBX
 {
     // common base
     internal abstract class SectionBase
diff --git a/Assets/Stickers/Editor/PBX/Sections.cs.meta b/Assets/Stickers/Editor/Xcode/PBX/Sections.cs.meta
similarity index 100%
rename from Assets/Stickers/Editor/PBX/Sections.cs.meta
rename to Assets/Stickers/Editor/Xcode/PBX/Sections.cs.meta
diff --git a/Assets/Stickers/Editor/PBX/Serializer.cs b/Assets/Stickers/Editor/Xcode/PBX/Serializer.cs
similarity index 99%
rename from Assets/Stickers/Editor/PBX/Serializer.cs
rename to Assets/Stickers/Editor/Xcode/PBX/Serializer.cs
index 2328117..2b3b351 100644
--- a/Assets/Stickers/Editor/PBX/Serializer.cs
+++ b/Assets/Stickers/Editor/Xcode/PBX/Serializer.cs
@@ -5,7 +5,7 @@
 using System.IO;
 using System.Linq;
 
-namespace UnityEditor.iOS.Xcode.PBX
+namespace Agens.StickersEditor.UnityEditor.iOS.Xcode.PBX
 {    
     class PropertyCommentChecker
     {
diff --git a/Assets/Stickers/Editor/PBX/Serializer.cs.meta b/Assets/Stickers/Editor/Xcode/PBX/Serializer.cs.meta
similarity index 100%
rename from Assets/Stickers/Editor/PBX/Serializer.cs.meta
rename to Assets/Stickers/Editor/Xcode/PBX/Serializer.cs.meta
diff --git a/Assets/Stickers/Editor/PBX/Utils.cs b/Assets/Stickers/Editor/Xcode/PBX/Utils.cs
similarity index 99%
rename from Assets/Stickers/Editor/PBX/Utils.cs
rename to Assets/Stickers/Editor/Xcode/PBX/Utils.cs
index 48f4cde..774faa5 100644
--- a/Assets/Stickers/Editor/PBX/Utils.cs
+++ b/Assets/Stickers/Editor/Xcode/PBX/Utils.cs
@@ -4,7 +4,7 @@
 using System.Text.RegularExpressions;
 using System.IO;
 
-namespace UnityEditor.iOS.Xcode.PBX
+namespace Agens.StickersEditor.UnityEditor.iOS.Xcode.PBX
 {
     internal class GUIDToCommentMap
     {
diff --git a/Assets/Stickers/Editor/PBX/Utils.cs.meta b/Assets/Stickers/Editor/Xcode/PBX/Utils.cs.meta
similarity index 100%
rename from Assets/Stickers/Editor/PBX/Utils.cs.meta
rename to Assets/Stickers/Editor/Xcode/PBX/Utils.cs.meta
diff --git a/Assets/Stickers/Editor/PBXProject.cs b/Assets/Stickers/Editor/Xcode/PBXProject.cs
similarity index 99%
rename from Assets/Stickers/Editor/PBXProject.cs
rename to Assets/Stickers/Editor/Xcode/PBXProject.cs
index 0b96e3c..1169b27 100644
--- a/Assets/Stickers/Editor/PBXProject.cs
+++ b/Assets/Stickers/Editor/Xcode/PBXProject.cs
@@ -3,10 +3,10 @@
 using System.Text.RegularExpressions;
 using System.IO;
 using System;
-using UnityEditor.iOS.Xcode.PBX;
+using Agens.StickersEditor.UnityEditor.iOS.Xcode.PBX;
 using UnityEngine;
 
-namespace UnityEditor.iOS.Xcode.Stickers
+namespace Agens.StickersEditor.UnityEditor.iOS.Xcode
 {
     using PBXBuildFileSection           = KnownSectionBase<PBXBuildFileData>;
     using PBXFileReferenceSection       = KnownSectionBase<PBXFileReferenceData>;
@@ -25,7 +25,7 @@ namespace UnityEditor.iOS.Xcode.Stickers
     using XCConfigurationListSection    = KnownSectionBase<XCConfigurationListData>;
     using UnknownSection                = KnownSectionBase<PBXObjectData>;
 
-    /*// Determines the tree the given path is relative to
+    // Determines the tree the given path is relative to
     public enum PBXSourceTree
     {
         Absolute,   // The path is absolute
@@ -35,7 +35,7 @@ public enum PBXSourceTree
         Build,      // The path is relative to the build products folder
         Developer,  // The path is relative to the developer folder
         Sdk         // The path is relative to the sdk folder
-    };*/
+    };
 
     public class PBXProject
     {
diff --git a/Assets/Stickers/Editor/PBXProject.cs.meta b/Assets/Stickers/Editor/Xcode/PBXProject.cs.meta
similarity index 100%
rename from Assets/Stickers/Editor/PBXProject.cs.meta
rename to Assets/Stickers/Editor/Xcode/PBXProject.cs.meta
diff --git a/Assets/Stickers/Editor/PBXProjectData.cs b/Assets/Stickers/Editor/Xcode/PBXProjectData.cs
similarity index 99%
rename from Assets/Stickers/Editor/PBXProjectData.cs
rename to Assets/Stickers/Editor/Xcode/PBXProjectData.cs
index 6bac5c7..bef5103 100644
--- a/Assets/Stickers/Editor/PBXProjectData.cs
+++ b/Assets/Stickers/Editor/Xcode/PBXProjectData.cs
@@ -3,9 +3,9 @@
 using System.Text.RegularExpressions;
 using System.IO;
 using System;
-using UnityEditor.iOS.Xcode.PBX;
+using Agens.StickersEditor.UnityEditor.iOS.Xcode.PBX;
 
-namespace UnityEditor.iOS.Xcode
+namespace Agens.StickersEditor.UnityEditor.iOS.Xcode
 {
     using PBXBuildFileSection           = KnownSectionBase<PBXBuildFileData>;
     using PBXFileReferenceSection       = KnownSectionBase<PBXFileReferenceData>;
diff --git a/Assets/Stickers/Editor/PBXProjectData.cs.meta b/Assets/Stickers/Editor/Xcode/PBXProjectData.cs.meta
similarity index 100%
rename from Assets/Stickers/Editor/PBXProjectData.cs.meta
rename to Assets/Stickers/Editor/Xcode/PBXProjectData.cs.meta
diff --git a/Assets/Stickers/Editor/PlistParser.cs b/Assets/Stickers/Editor/Xcode/PlistParser.cs
similarity index 99%
rename from Assets/Stickers/Editor/PlistParser.cs
rename to Assets/Stickers/Editor/Xcode/PlistParser.cs
index bfdfcb3..715b216 100644
--- a/Assets/Stickers/Editor/PlistParser.cs
+++ b/Assets/Stickers/Editor/Xcode/PlistParser.cs
@@ -6,7 +6,7 @@
 using System.Xml.Linq;
 using System.Xml.XPath;
 
-namespace UnityEditor.iOS.Xcode.Stickers
+namespace Agens.StickersEditor.UnityEditor.iOS.Xcode
 {
     public class PlistElement
     {
diff --git a/Assets/Stickers/Editor/PlistParser.cs.meta b/Assets/Stickers/Editor/Xcode/PlistParser.cs.meta
similarity index 100%
rename from Assets/Stickers/Editor/PlistParser.cs.meta
rename to Assets/Stickers/Editor/Xcode/PlistParser.cs.meta