diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a4d6d9c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.vs/
\ No newline at end of file
diff --git a/CPopUpLibrary/Downloads/CPopupLibrary.iOS.zip b/CPopUpLibrary/Downloads/CPopupLibrary.iOS.zip
deleted file mode 100644
index 640da83..0000000
Binary files a/CPopUpLibrary/Downloads/CPopupLibrary.iOS.zip and /dev/null differ
diff --git a/CPopUpLibrary/Downloads/CPopupLibraryDEMO.iOS.zip b/CPopUpLibrary/Downloads/CPopupLibraryDEMO.iOS.zip
deleted file mode 100644
index e446d78..0000000
Binary files a/CPopUpLibrary/Downloads/CPopupLibraryDEMO.iOS.zip and /dev/null differ
diff --git a/CPopUpLibrary/Source/CPopupLibrary.iOS/CustomPopUpViewController.cs b/CPopUpLibrary/Source/CPopupLibrary.iOS/CustomPopUpViewController.cs
deleted file mode 100644
index 73730ae..0000000
--- a/CPopUpLibrary/Source/CPopupLibrary.iOS/CustomPopUpViewController.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-
-// <-----/ FAQ \----->
-// Q. What happen when i do this.ShowPopUp() here?
-// A. The app will be show 2 popups, do not reccomended
-// Q. Where i can find an updates for this library?
-// A. You can find us on github: https://github.com/Mondonno/CustomPopUps.iOS/
-// Q. Where i can find full tutorial how to customize this popup?
-// A. Soon we share some tutorials on our project github wiki
-// <-----/ FAQ \----->
-
-using System;
-using UIKit;
-using CoreGraphics;
-using Foundation;
-using System.Threading.Tasks;
-
-namespace CPopupLibrary
-{
-    public class CustomPopUpViewController : UIView
-    {
-        public delegate void PopWillOpenHandler();
-        
-        public delegate void PopWillCloseHandler();
-
-        //You can use it to handle the closing PopUp event
-        public event PopWillCloseHandler PopUpWillClose;
-        public event PopWillOpenHandler  PopUpWillOpen;
-
-        private UIVisualEffectView effectView = new UIVisualEffectView(UIBlurEffect.FromStyle(UIBlurEffectStyle.Dark));
-
-        //Initializing PopUp
-        public void CustomPopUpInit(CGSize size, nfloat? FrameRadius = null)
-        {
-            //Setting size and makeing effects
-            nfloat lx = (UIScreen.MainScreen.Bounds.Width - size.Width) / 2;
-            nfloat ly = (UIScreen.MainScreen.Bounds.Height - size.Height) / 2;
-            this.Frame = new CGRect(new CGPoint(lx, ly), size);
-            if(FrameRadius == null) FrameRadius = 0;
-            this.Layer.CornerRadius = FrameRadius;
-            effectView.Alpha = 0;
-        }
-
-        //PopUp Showing
-        public void PopUp( bool animated = true, Action popAnimationFinish = null)
-        {
-            //Setting UIWindow to show popup
-            UIWindow window = UIApplication.SharedApplication.KeyWindow;
-            //Setting effect view frame
-            effectView.Frame = window.Bounds;
-            //Editing windows
-            window.EndEditing(true);
-            window.AddSubview(effectView);
-            window.AddSubview(this);
-            //Checking if animated
-            if (animated)
-            {
-                //Transforming to 0.1f Scale to make animation
-                Transform = CGAffineTransform.MakeScale(0.1f, 0.1f);
-                //Animating UIView by Core Grpahics
-                UIView.Animate(0.15, delegate {
-                    //Making other animations
-                    Transform = CGAffineTransform.MakeScale(1, 1);
-                    effectView.Alpha = 0.8f;
-                }, delegate {
-                    //Running event
-                    if (null != PopUpWillOpen)
-                        PopUpWillOpen();
-                });
-            }
-            else
-            {
-                //Changing alpha in effect view
-                effectView.Alpha = 0.8f;
-            }
-        }
-
-        //Closing PopUp
-        public void Close(bool animated = true)
-        {
-            //Checking if animated
-            if (animated)
-            {
-                //Animating UIView by Core Grpahics
-                UIView.Animate(0.15, delegate {
-                    //Making other animations
-                    Transform = CGAffineTransform.MakeScale(0.1f, 0.1f);
-                    effectView.Alpha = 0;
-                }, delegate {
-                    //Removing from View Controller PopUp and Effects
-                    this.RemoveFromSuperview();
-                    effectView.RemoveFromSuperview();
-                    //Running event (PopUpWillClose)
-                    if (null != PopUpWillClose) PopUpWillClose();
-                });
-            }
-            else
-            {
-                //Running event (PopUpWillClose)
-                if (null != PopUpWillClose) PopUpWillClose();
-            }
-
-        }
-    
-    } 
-} 
\ No newline at end of file
diff --git a/CPopUpLibrary/Source/CPopupLibrary.iOS/PopUpsObjects.cs b/CPopUpLibrary/Source/CPopupLibrary.iOS/PopUpsObjects.cs
deleted file mode 100644
index ba7d464..0000000
--- a/CPopUpLibrary/Source/CPopupLibrary.iOS/PopUpsObjects.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace CPopupLibrary
-{
-    public class PopUpsObjects : CustomPopUpViewController
-    {
-        //Give {get; set;} if you wan't to set popup settings in your code
-        //Set your popup size!
-        public double PopUpWidth { get; set; }
-        public double PopUpHeight { get; set; }
-        //Set your popup radius! (0 for any radius OR 6f for all rounded) 
-        public double FrameRadius { get; set; }
-
-        //Custom background RGB color (you can set it here, in the popup object, or in YourPopUpCode() method with this.BackgroundColor
-        //SOON
-        nfloat[] RGBColors = { 12,12,12 };
-
-        public enum AniamtionType
-        {
-            Normal,
-            Bounce
-        }
-        public enum Animated
-        {
-            Yes,
-            No,
-        }
-        public enum PopActionType
-        {
-            Close,
-            Show
-        }
-    }
-}
diff --git a/CPopUpLibrary/Source/CPopupLibrary.iOS/YourCustomizePopup.cs b/CPopUpLibrary/Source/CPopupLibrary.iOS/YourCustomizePopup.cs
deleted file mode 100644
index de1c11e..0000000
--- a/CPopUpLibrary/Source/CPopupLibrary.iOS/YourCustomizePopup.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// <-----/ FAQ \----->
-// Q. What happen when i do this.ShowPopUp() here?
-// A. The app will be show 2 popups, do not reccomended
-// Q. Where i can find an updates for this library?
-// A. You can find us on github: https://github.com/Mondonno/CustomPopUps.iOS/
-// Q. Where i can find full tutorial how to customize this popup?
-// A. Soon we share some tutorials on our project github wiki
-// <-----/ FAQ \----->
-
-using System;
-using System.Threading.Tasks;
-using UIKit;
-using Foundation;
-using CoreGraphics;
-
-namespace CPopupLibrary
-{
-    public class YourCustomizePopup : PopUpsObjects
-    {
-        #region PUSS | PopUps System Settings
-        public async Task ShowPopUp()
-        {
-            await YourPopUpCode();
-        }
-        private protected async Task Init()
-        {
-            //You can set if you want to get animated popup by changing the true value!
-            //Adding the PopUp Closing handler
-            PopUpWillClose += PopWillClose;
-
-            PopUp(true,//Here you can chenge animating!
-                async delegate {
-                    //Do stuff when the popup will be opened
-                    //Or you can add here handling method
-                    await OpenHandler();
-                });
-        }
-        #endregion
-
-        public YourCustomizePopup()
-        {
- 
-        }
-  
-        private protected async Task OpenHandler()
-        {
-            //This code below will be started when the popup will be opened!
-            //Do stuff!
-
-        }
-        private protected async void PopWillClose()
-        {
-            //This code below will be started when the PopUp will be Closed!
-            //Do stuff!
-
-        }
-
-        private async Task YourPopUpCode()
-        {
-            #region Starting
-            CGSize PopUpSize = new CGSize(PopUpWidth, PopUpHeight);
-            CustomPopUpInit(PopUpSize, (nfloat) FrameRadius);
-            #endregion
-
-            // Here write your PopUp code and declare the objects
-            
-            #region Initializing
-            //IMPORTANT! DO NOT CHANGE THIS!
-            await Init();
-            #endregion
-        }
-    }
-}
diff --git a/CPopUpLibrary/Source/CPopupLibraryDEMO.iOS/CustomPopUpViewController.cs b/CPopUpLibrary/Source/CPopupLibraryDEMO.iOS/CustomPopUpViewController.cs
deleted file mode 100644
index 577d3f9..0000000
--- a/CPopUpLibrary/Source/CPopupLibraryDEMO.iOS/CustomPopUpViewController.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-
-// <-----/ FAQ \----->
-// Q. What happen when i do this.ShowPopUp() here?
-// A. The app will be show 2 popups, do not reccomended
-// Q. Where i can find an updates for this library?
-// A. You can find us on github: https://github.com/Mondonno/CustomPopUps.iOS/
-// Q. Where i can find full tutorial how to customize this popup?
-// A. Soon we share some tutorials on our project github wiki
-// <-----/ FAQ \----->
-
-using System;
-using UIKit;
-using CoreGraphics;
-using Foundation;
-using System.Threading.Tasks;
-
-namespace CPopupLibrary
-{
-    public class CustomPopUpViewController : UIView
-    {
-        
-        public delegate void PopWillCloseHandler();
-
-        //You can use it to handle the closing PopUp event
-        public event PopWillCloseHandler PopUpWillClose;
-
-        private UIVisualEffectView effectView = new UIVisualEffectView(UIBlurEffect.FromStyle(UIBlurEffectStyle.Dark));
-
-        //Initializing PopUp
-        public void CustomPopUpInit(CGSize size, nfloat?  FrameRadius = null)
-        {
-            //Setting size and makeing effects
-            nfloat lx = (UIScreen.MainScreen.Bounds.Width - size.Width) / 2;
-            nfloat ly = (UIScreen.MainScreen.Bounds.Height - size.Height) / 2;
-            this.Frame = new CGRect(new CGPoint(lx, ly), size);
-            if(FrameRadius == null) FrameRadius = 0;
-            this.Layer.CornerRadius = FrameRadius;
-            effectView.Alpha = 0;
-        }
-
-        //PopUp Showing
-        public void PopUp( bool animated = true, Action popAnimationFinish = null)
-        {
-            //Setting UIWindow to show popup
-            UIWindow window = UIApplication.SharedApplication.KeyWindow;
-            //Setting effect view frame
-            effectView.Frame = window.Bounds;
-            //Editing windows
-            window.EndEditing(true);
-            window.AddSubview(effectView);
-            window.AddSubview(this);
-            //Checking if animated
-            if (animated)
-            {
-                //Transforming to 0.1f Scale to make animation
-                Transform = CGAffineTransform.MakeScale(0.1f, 0.1f);
-                //Animating UIView by Core Grpahics
-                UIView.Animate(0.15, delegate {
-                    //Making other animations
-                    Transform = CGAffineTransform.MakeScale(1, 1);
-                    effectView.Alpha = 0.8f;
-                }, delegate {
-                    
-                    //Running event
-                    if (null != PopUpWillOpen)
-                        PopUpWillOpen();
-                });
-            }
-            else
-            {
-                //Changing alpha in effect view
-                effectView.Alpha = 0.8f;
-            }
-        }
-
-        //Closing PopUp
-        public void Close(bool animated = true)
-        {
-            //Checking if animated
-            if (animated)
-            {
-                //Animating UIView by Core Grpahics
-                UIView.Animate(0.15, delegate {
-                    //Making other animations
-                    Transform = CGAffineTransform.MakeScale(0.1f, 0.1f);
-                    effectView.Alpha = 0;
-                }, delegate {
-                    //Removing from View Controller PopUp and Effects
-                    this.RemoveFromSuperview();
-                    effectView.RemoveFromSuperview();
-                    //Running event (PopUpWillClose)
-                    if (null != PopUpWillClose) PopUpWillClose();
-                });
-            }
-            else
-            {
-                //Running event (PopUpWillClose)
-                if (null != PopUpWillClose) PopUpWillClose();
-            }
-
-        }
-    
-    } 
-} 
\ No newline at end of file
diff --git a/CPopUpLibrary/Source/CPopupLibraryDEMO.iOS/PopUpsObjects.cs b/CPopUpLibrary/Source/CPopupLibraryDEMO.iOS/PopUpsObjects.cs
deleted file mode 100644
index ba7d464..0000000
--- a/CPopUpLibrary/Source/CPopupLibraryDEMO.iOS/PopUpsObjects.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace CPopupLibrary
-{
-    public class PopUpsObjects : CustomPopUpViewController
-    {
-        //Give {get; set;} if you wan't to set popup settings in your code
-        //Set your popup size!
-        public double PopUpWidth { get; set; }
-        public double PopUpHeight { get; set; }
-        //Set your popup radius! (0 for any radius OR 6f for all rounded) 
-        public double FrameRadius { get; set; }
-
-        //Custom background RGB color (you can set it here, in the popup object, or in YourPopUpCode() method with this.BackgroundColor
-        //SOON
-        nfloat[] RGBColors = { 12,12,12 };
-
-        public enum AniamtionType
-        {
-            Normal,
-            Bounce
-        }
-        public enum Animated
-        {
-            Yes,
-            No,
-        }
-        public enum PopActionType
-        {
-            Close,
-            Show
-        }
-    }
-}
diff --git a/CPopUpLibrary/Source/CPopupLibraryDEMO.iOS/YourCustomizePopup.cs b/CPopUpLibrary/Source/CPopupLibraryDEMO.iOS/YourCustomizePopup.cs
deleted file mode 100644
index 0e2f87c..0000000
--- a/CPopUpLibrary/Source/CPopupLibraryDEMO.iOS/YourCustomizePopup.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-
-// <-----/ FAQ \----->
-// Q. What happen when i do this.ShowPopUp() here?
-// A. The app will be show 2 popups, do not reccomended
-// Q. Where i can find an updates for this library?
-// A. You can find us on github: https://github.com/Mondonno/CustomPopUps.iOS/
-// Q. Where i can find full tutorial how to customize this popup?
-// A. Soon we share some tutorials on our project github wiki
-// <-----/ FAQ \----->
-
-using System;
-using System.Threading.Tasks;
-using UIKit;
-using Foundation;
-using CoreGraphics;
-
-namespace CPopupLibrary
-{
-    public class YourCustomizePopup : PopUpsObjects
-    {
-        #region PUSS | PopUps System Settings
-        public async Task ShowPopUp()
-        {
-            await YourPopUpCode();
-        }
-        private protected async Task Init()
-        {
-            //You can set if you want to get animated popup by changing the true value!
-            //Adding the PopUp Closing handler
-            PopUpWillClose += PopWillClose;
-
-            PopUp(true,//Here you can chenge animating!
-                async delegate {
-                    //Do stuff when the popup will be opened
-                    //Or you can add here handling method
-                    await OpenHandler();
-                });
-        }
-        #endregion
-
-        public YourCustomizePopup()
-        {
-
-        }
-
-        private protected async Task OpenHandler()
-        {
-            //This code below will be started when the popup will be opened!
-            //Do stuff!
-
-        }
-        private protected async void PopWillClose()
-        {
-            //This code below will be started when the PopUp will be Closed!
-            //Do stuff!
-
-        }
-
-     
-
-        private async Task YourPopUpCode()
-        {
-            #region Starting
-            CGSize PopUpSize = new CGSize(PopUpWidth, PopUpHeight);
-            CustomPopUpInit(PopUpSize, (nfloat) FrameRadius);
-            #endregion
-
-            // Here write your PopUp code and declare the objects
-
-            UIButton btnClose = new UIButton(UIButtonType.System);
-        nfloat btnHeight = 40;
-            btnClose.SetTitle("Close", UIControlState.Normal);
-            btnClose.Frame = new CGRect(0, this.Frame.Height - btnHeight, this.Frame.Width, btnHeight);
-            btnClose.TouchUpInside += delegate {
-                Close();
-            };
-            
-            
-            btnClose.TitleShadowOffset = new CGSize(0, 1);
-            this.BackgroundColor = UIColor.White;
-            btnClose.BackgroundColor = UIColor.White;
-            btnClose.TintColor = UIColor.Black;
-            btnClose.Font = UIFont.FromName("Futura", 30);
-
-            this.AddSubview(btnClose);
-            
-
-            #region Initializing
-            //IMPORTANT! DO NOT CHANGE THIS!
-            await Init();
-            #endregion
-        }
-    }
-}
diff --git a/CustomPopUps.iOS.sln b/CustomPopUps.iOS.sln
new file mode 100644
index 0000000..3244993
--- /dev/null
+++ b/CustomPopUps.iOS.sln
@@ -0,0 +1,73 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.6.30114.105
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomPopUps", "CustomPopUps\CustomPopUps.csproj", "{E50C90AE-46EE-4D82-BA91-723EC7C9621D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.iOS", "Test.iOS\Test.iOS.csproj", "{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Debug|iPhoneSimulator = Debug|iPhoneSimulator
+		Release|iPhoneSimulator = Release|iPhoneSimulator
+		Debug|iPhone = Debug|iPhone
+		Release|iPhone = Release|iPhone
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E50C90AE-46EE-4D82-BA91-723EC7C9621D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E50C90AE-46EE-4D82-BA91-723EC7C9621D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E50C90AE-46EE-4D82-BA91-723EC7C9621D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E50C90AE-46EE-4D82-BA91-723EC7C9621D}.Debug|x64.Build.0 = Debug|Any CPU
+		{E50C90AE-46EE-4D82-BA91-723EC7C9621D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E50C90AE-46EE-4D82-BA91-723EC7C9621D}.Debug|x86.Build.0 = Debug|Any CPU
+		{E50C90AE-46EE-4D82-BA91-723EC7C9621D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E50C90AE-46EE-4D82-BA91-723EC7C9621D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E50C90AE-46EE-4D82-BA91-723EC7C9621D}.Release|x64.ActiveCfg = Release|Any CPU
+		{E50C90AE-46EE-4D82-BA91-723EC7C9621D}.Release|x64.Build.0 = Release|Any CPU
+		{E50C90AE-46EE-4D82-BA91-723EC7C9621D}.Release|x86.ActiveCfg = Release|Any CPU
+		{E50C90AE-46EE-4D82-BA91-723EC7C9621D}.Release|x86.Build.0 = Release|Any CPU
+		{E50C90AE-46EE-4D82-BA91-723EC7C9621D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{E50C90AE-46EE-4D82-BA91-723EC7C9621D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{E50C90AE-46EE-4D82-BA91-723EC7C9621D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{E50C90AE-46EE-4D82-BA91-723EC7C9621D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{E50C90AE-46EE-4D82-BA91-723EC7C9621D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{E50C90AE-46EE-4D82-BA91-723EC7C9621D}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{E50C90AE-46EE-4D82-BA91-723EC7C9621D}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{E50C90AE-46EE-4D82-BA91-723EC7C9621D}.Release|iPhone.Build.0 = Release|Any CPU
+		{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+		{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
+		{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator
+		{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}.Debug|x64.Build.0 = Debug|iPhoneSimulator
+		{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator
+		{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}.Debug|x86.Build.0 = Debug|iPhoneSimulator
+		{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
+		{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
+		{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}.Release|x64.ActiveCfg = Release|iPhoneSimulator
+		{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}.Release|x64.Build.0 = Release|iPhoneSimulator
+		{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}.Release|x86.ActiveCfg = Release|iPhoneSimulator
+		{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}.Release|x86.Build.0 = Release|iPhoneSimulator
+		{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}.Debug|iPhone.Build.0 = Debug|iPhone
+		{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}.Release|iPhone.ActiveCfg = Release|iPhone
+		{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}.Release|iPhone.Build.0 = Release|iPhone
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.DotNetNamingPolicy = $1
+		$1.DirectoryNamespaceAssociation = PrefixedHierarchical
+	EndGlobalSection
+EndGlobal
diff --git a/CustomPopUps/.gitignore b/CustomPopUps/.gitignore
new file mode 100644
index 0000000..d86ba9f
--- /dev/null
+++ b/CustomPopUps/.gitignore
@@ -0,0 +1,2 @@
+obj/
+bin/
\ No newline at end of file
diff --git a/CustomPopUps/BasePopUp.cs b/CustomPopUps/BasePopUp.cs
new file mode 100644
index 0000000..3461c84
--- /dev/null
+++ b/CustomPopUps/BasePopUp.cs
@@ -0,0 +1,70 @@
+using System;
+using UIKit;
+using CoreGraphics;
+
+namespace CustomPopUps
+{
+    public class BasePopUp : UIView
+    {
+        public BasePopUp(CGSize size) : base()
+        {
+            nfloat lx = (UIScreen.MainScreen.Bounds.Width - size.Width) / 2;
+            nfloat ly = (UIScreen.MainScreen.Bounds.Height - size.Height) / 2;
+
+            Frame = new CGRect(new CGPoint(lx, ly), size);
+            Layer.CornerRadius = Constants.LayerRadius;
+
+            clickOutCloseView.AddGestureRecognizer(new UITapGestureRecognizer(() => Close()));
+        }
+
+        private UIView clickOutCloseView = new UIView();
+        private UIVisualEffectView EffectView = new UIVisualEffectView(UIBlurEffect.FromStyle(Constants.BlurEffect));
+
+        public delegate void OnCloseHandler();
+        public delegate void OnOpenHandler();
+
+        public event OnCloseHandler OnClose;
+        public event OnOpenHandler OnOpen;
+
+        public void Show()
+        {
+            UIWindow window = UIApplication.SharedApplication.KeyWindow;
+
+            if (window != null)
+            {
+                EffectView.Frame = window.Bounds;
+
+                window.EndEditing(true);
+                window.AddSubview(EffectView);
+
+                clickOutCloseView.BackgroundColor = null;
+                clickOutCloseView.Frame = window.Frame;
+
+                window.AddSubview(clickOutCloseView);
+                window.AddSubview(this);
+            }
+
+            Transform = CGAffineTransform.MakeScale(0.1f, 0.1f);
+            Animate(Constants.AnimationDuration, delegate {
+                Transform = CGAffineTransform.MakeScale(1, 1);
+                EffectView.Alpha = Constants.EffectViewAlpha;
+            }, delegate {
+                OnOpen?.Invoke();
+            });
+        }
+
+        public void Close()
+        {
+            Animate(Constants.AnimationDuration, delegate {
+                Transform = CGAffineTransform.MakeScale(0.1f, 0.1f);
+                EffectView.Alpha = 0;
+            }, delegate {
+                RemoveFromSuperview();
+                clickOutCloseView.RemoveFromSuperview();
+                EffectView.RemoveFromSuperview();
+
+                OnClose?.Invoke();
+            });
+        }
+    }
+}
diff --git a/CustomPopUps/Constants.cs b/CustomPopUps/Constants.cs
new file mode 100644
index 0000000..7c3f864
--- /dev/null
+++ b/CustomPopUps/Constants.cs
@@ -0,0 +1,15 @@
+using System;
+using UIKit;
+
+namespace CustomPopUps
+{
+    public static class Constants
+    {
+        public static double AnimationDuration { get; } = 0.15;
+        public static nfloat EffectViewAlpha { get; } = 0.8f;
+
+        public static nfloat LayerRadius { get; } = 0;
+        public static UIColor Color { get; } = UIColor.White;
+        public static UIBlurEffectStyle BlurEffect { get; } = UIBlurEffectStyle.Dark;
+    }
+}
diff --git a/CustomPopUps/CustomPopUps.csproj b/CustomPopUps/CustomPopUps.csproj
new file mode 100644
index 0000000..4b6e72e
--- /dev/null
+++ b/CustomPopUps/CustomPopUps.csproj
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{E50C90AE-46EE-4D82-BA91-723EC7C9621D}</ProjectGuid>
+    <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TemplateGuid>{a52b8a63-bc84-4b47-910d-692533484892}</TemplateGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>CustomPopUps</RootNamespace>
+    <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
+    <AssemblyName>CustomPopUps</AssemblyName>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="Xamarin.iOS" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="BasePopUp.cs" />
+    <Compile Include="Constants.cs" />
+    <Compile Include="PopUp.cs" />
+    <Compile Include="PopUpStack.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/CustomPopUps/PopUp.cs b/CustomPopUps/PopUp.cs
new file mode 100644
index 0000000..9755a84
--- /dev/null
+++ b/CustomPopUps/PopUp.cs
@@ -0,0 +1,17 @@
+using System;
+using CoreGraphics;
+
+namespace CustomPopUps
+{
+    public class PopUp : BasePopUp
+    {
+        public PopUp(CGSize size) : base(size)
+        {
+            BackgroundColor = Constants.Color;
+        }
+        public PopUp(CGSize size, Action<PopUp> init) : this(size)
+        {
+            init(this);
+        }
+    }
+}
diff --git a/CustomPopUps/PopUpStack.cs b/CustomPopUps/PopUpStack.cs
new file mode 100644
index 0000000..de8ada8
--- /dev/null
+++ b/CustomPopUps/PopUpStack.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+
+namespace CustomPopUps
+{
+    public class PopUpStack
+    {
+        public List<PopUp> PopUps { get; private set; } = new List<PopUp>();
+
+        public void Add(PopUp pop)
+            => PopUps.Add(pop);
+
+        public void Show(PopUp popUp)
+        {
+            Add(popUp);
+            Show(PopUps.Count - 1);
+        }
+
+        public void Show(int index)
+        {
+            Hide(index - 1);
+            PopUps[index].Show();
+        }
+
+        public void Remove(int index)
+        {
+            Hide(index);
+            PopUps.RemoveAt(index);
+            if (index - 1 >= 0) Show(index - 1);
+        }
+
+        public void Hide(int index)
+            => PopUps[index].Close();
+    }
+}
diff --git a/Examples/Projects/CustomPopUpDemo/Properties/AssemblyInfo.cs b/CustomPopUps/Properties/AssemblyInfo.cs
similarity index 93%
rename from Examples/Projects/CustomPopUpDemo/Properties/AssemblyInfo.cs
rename to CustomPopUps/Properties/AssemblyInfo.cs
index 8156237..c9a4529 100644
--- a/Examples/Projects/CustomPopUpDemo/Properties/AssemblyInfo.cs
+++ b/CustomPopUps/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("CustomPopUpDemo")]
+[assembly: AssemblyTitle("CustomPopUps")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CustomPopUpDemo")]
+[assembly: AssemblyProduct("CustomPopUps")]
 [assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/Examples/PopUpsCode/#1PopBasicCode.txt b/Examples/#1PopBasicCode.txt
similarity index 100%
rename from Examples/PopUpsCode/#1PopBasicCode.txt
rename to Examples/#1PopBasicCode.txt
diff --git a/Examples/PopUpsCode/#2ActivityPopCode.txt b/Examples/#2ActivityPopCode.txt
similarity index 100%
rename from Examples/PopUpsCode/#2ActivityPopCode.txt
rename to Examples/#2ActivityPopCode.txt
diff --git a/Examples/PopUpsCode/#3WebViewPopCode.txt b/Examples/#3WebViewPopCode.txt
similarity index 100%
rename from Examples/PopUpsCode/#3WebViewPopCode.txt
rename to Examples/#3WebViewPopCode.txt
diff --git a/Examples/Projects/CustomPopUpDemo/CPopupLibrary/CustomPopUpViewController.cs b/Examples/Projects/CustomPopUpDemo/CPopupLibrary/CustomPopUpViewController.cs
deleted file mode 100644
index 18904be..0000000
--- a/Examples/Projects/CustomPopUpDemo/CPopupLibrary/CustomPopUpViewController.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-
-// <-----/ FAQ \----->
-// Q. What happen when i do this.ShowPopUp() here?
-// A. The app will be show 2 popups, do not reccomended
-// Q. Where i can find an updates for this library?
-// A. You can find us on github: https://github.com/Mondonno/CustomPopUps.iOS/
-// Q. Where i can find full tutorial how to customize this popup?
-// A. Soon we share some tutorials on our project github wiki
-// <-----/ FAQ \----->
-
-using System;
-using UIKit;
-using CoreGraphics;
-using Foundation;
-using System.Threading.Tasks;
-
-namespace CPopupLibrary
-{
-    public class CustomPopUpViewController : UIView
-    {
-        
-        public delegate void PopWillCloseHandler();
-
-        //You can use it to handle the closing PopUp event
-        public event PopWillCloseHandler PopUpWillClose;
-
-        private UIVisualEffectView effectView = new UIVisualEffectView(UIBlurEffect.FromStyle(UIBlurEffectStyle.Dark));
-
-        //Initializing PopUp
-        public void CustomPopUpInit(CGSize size, nfloat? frame_radius = null)
-        {
-            //Setting size and makeing effects
-            nfloat lx = (UIScreen.MainScreen.Bounds.Width - size.Width) / 2;
-            nfloat ly = (UIScreen.MainScreen.Bounds.Height - size.Height) / 2;
-            this.Frame = new CGRect(new CGPoint(lx, ly), size);
-            effectView.Alpha = 0;
-        }
-
-        //PopUp Showing
-        public void PopUp( bool animated = true, Action popAnimationFinish = null)
-        {
-            //Setting UIWindow to show popup
-            UIWindow window = UIApplication.SharedApplication.KeyWindow;
-            //Setting effect view frame
-            effectView.Frame = window.Bounds;
-            //Editing windows
-            window.EndEditing(true);
-            window.AddSubview(effectView);
-            window.AddSubview(this);
-            //Checking if animated
-            if (animated)
-            {
-                //Transforming to 0.1f Scale to make animation
-                Transform = CGAffineTransform.MakeScale(0.1f, 0.1f);
-                //Animating UIView by Core Grpahics
-                UIView.Animate(0.15, delegate {
-                    //Making other animations
-                    Transform = CGAffineTransform.MakeScale(1, 1);
-                    effectView.Alpha = 0.8f;
-                }, delegate {
-                    //Running event (popAnimationFinish)
-                    if (null != popAnimationFinish)
-                        popAnimationFinish();
-                });
-            }
-            else
-            {
-                //Changing alpha in effect view
-                effectView.Alpha = 0.8f;
-            }
-        }
-
-        //Closing PopUp
-        public void Close(bool animated = true)
-        {
-            //Checking if animated
-            if (animated)
-            {
-                //Animating UIView by Core Grpahics
-                UIView.Animate(0.15, delegate {
-                    //Making other animations
-                    Transform = CGAffineTransform.MakeScale(0.1f, 0.1f);
-                    effectView.Alpha = 0;
-                }, delegate {
-                    //Removing from View Controller PopUp and Effects
-                    this.RemoveFromSuperview();
-                    effectView.RemoveFromSuperview();
-                    //Running event (PopUpWillClose)
-                    if (null != PopUpWillClose) PopUpWillClose();
-                });
-            }
-            else
-            {
-                //Running event (PopUpWillClose)
-                if (null != PopUpWillClose) PopUpWillClose();
-            }
-
-        }
-    
-    }
-}
\ No newline at end of file
diff --git a/Examples/Projects/CustomPopUpDemo/CPopupLibrary/PopUpsObjects.cs b/Examples/Projects/CustomPopUpDemo/CPopupLibrary/PopUpsObjects.cs
deleted file mode 100644
index ccbf582..0000000
--- a/Examples/Projects/CustomPopUpDemo/CPopupLibrary/PopUpsObjects.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace CPopupLibrary
-{
-    public class PopUpsObjects : CustomPopUpViewController
-    {
-        //Working on it... (Alpha)
-        
-        public enum AniamtionType
-        {
-            Normal,
-            Slide,
-            Bounce
-        }
-        public enum Animated
-        {
-            Yes,
-            No,
-        }
-    }
-}
diff --git a/Examples/Projects/CustomPopUpDemo/CPopupLibrary/YourCustomizePopup.cs b/Examples/Projects/CustomPopUpDemo/CPopupLibrary/YourCustomizePopup.cs
deleted file mode 100644
index 94f92a4..0000000
--- a/Examples/Projects/CustomPopUpDemo/CPopupLibrary/YourCustomizePopup.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-
-// <-----/ FAQ \----->
-// Q. What happen when i do this.ShowPopUp() here?
-// A. The app will be show 2 popups, do not reccomended
-// Q. Where i can find an updates for this library?
-// A. You can find us on github: https://github.com/Mondonno/CustomPopUps.iOS/
-// Q. Where i can find full tutorial how to customize this popup?
-// A. Soon we share some tutorials on our project github wiki
-// <-----/ FAQ \----->
-
-using System;
-using System.Threading.Tasks;
-using UIKit;
-using Foundation;
-using CoreGraphics;
-
-namespace CPopupLibrary
-{
-    public class YourCustomizePopup : PopUpsObjects
-    {
-        //Set your popup size! 
-        public double PopUpWidth = 300;
-        public double PopUpHeight = 500;
-        //Set your popup radius! (0 for any radius) SOON!
-        public nfloat FrameRadius = 10;
-
-        #region PUSS | PopUps System Settings
-        public async Task ShowPopUp()
-        {
-            await YourPopUpCode();
-        }
-        private protected async Task Init()
-        {
-            //You can set if you want to get animated popup by changing the true value!
-            //Adding the PopUp Closing handler
-            PopUpWillClose += PopWillClose;
-
-            PopUp(true,//Here you can chenge animating!
-                async delegate {
-                    //Do stuff when the popup will be opened
-                    //Or you can add here handling method
-                    await OpenHandler();
-                });
-        }
-        #endregion
-
-        public YourCustomizePopup()
-        {
-
-        }
-
-        private protected async Task OpenHandler()
-        {
-            //This code below will be started when the popup will be opened!
-            //Do stuff!
-
-        }
-        private protected async void PopWillClose()
-        {
-            //This code below will be started when the PopUp will be Closed!
-            //Do stuff!
-
-        }
-
-      
-
-        private async Task YourPopUpCode()
-        {
-            #region Starting
-            CGSize PopUpSize = new CGSize(PopUpWidth, PopUpHeight);
-            CustomPopUpInit(PopUpSize);
-            #endregion
-
-            // Here write your PopUp code and declare the objects
-
-            UIButton btnClose = new UIButton(UIButtonType.System);
-            
-        nfloat btnHeight = 40;
-            btnClose.SetTitle("Close", UIControlState.Normal);
-            btnClose.Frame = new CGRect(0, this.Frame.Height - btnHeight, this.Frame.Width, btnHeight);
-            btnClose.TouchUpInside += delegate {
-                Close();
-            };
-            
-            btnClose.TitleShadowOffset = new CGSize(0, 1);
-            this.BackgroundColor = UIColor.White;
-            btnClose.BackgroundColor = UIColor.White;
-            btnClose.TintColor = UIColor.Black;
-            btnClose.Font = UIFont.FromName("Futura", 30);
-
-            this.AddSubview(btnClose);
-
-            #region Initializing
-            //IMPORTANT! DO NOT CHANGE THIS!
-            await Init();
-            #endregion
-        }
-    }
-}
diff --git a/Examples/Projects/CustomPopUpDemo/Main.storyboard b/Examples/Projects/CustomPopUpDemo/Main.storyboard
deleted file mode 100644
index a3f40d6..0000000
--- a/Examples/Projects/CustomPopUpDemo/Main.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="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772" />
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0" />
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="tne-QT-ifu">
-            <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ" />
-                        <viewControllerLayoutGuide type="bottom" id="wfy-db-euE" />
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="736" />
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" />
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB" />
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder" />
-            </objects>
-            <point key="canvasLocation" x="0.0" y="0.0" />
-        </scene>
-    </scenes>
-</document>
\ No newline at end of file
diff --git a/Examples/Projects/CustomPopUpDemo/ViewController.cs b/Examples/Projects/CustomPopUpDemo/ViewController.cs
deleted file mode 100644
index fd6854d..0000000
--- a/Examples/Projects/CustomPopUpDemo/ViewController.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using Foundation;
-using System;
-using UIKit;
-using CPopupLibrary;
-using CoreGraphics;
-
-namespace CustomPopUpDemo
-{
-    public partial class ViewController : UIViewController
-    {
-        public ViewController(IntPtr handle) : base(handle)
-        { 
-        }
-        public void PopWillClose()
-        {
-
-        }
-        public async override void ViewDidLoad()
-        {
-            base.ViewDidLoad();
-            // Perform any additional setup after loading the view, typically from a nib.
-           
-            UILabel label = new UILabel(new CGRect(100, 100, 70, 40));
-            label.Font = UIFont.SystemFontOfSize(30);
-            
-            this.View.AddSubview(label);
-            this.View.AddGestureRecognizer(new UITapGestureRecognizer(async () => {
-                YourCustomizePopup popup = new YourCustomizePopup();
-                popup.PopUpWidth = 300;
-                popup.PopUpHeight = 200;
-                await popup.ShowPopUp();
-                void PopWillClose()
-                {
-                    label.Text = popup.DemoTextView.Text;
-                }
-                popup.PopUpWillClose += PopWillClose;
-            }));
-
-            
-
-
-
-        }
-
-        public override void DidReceiveMemoryWarning()
-        {
-            base.DidReceiveMemoryWarning();
-            // Release any cached data, images, etc that aren't in use.
-        }
-    }
-}
\ No newline at end of file
diff --git a/Test.iOS/.gitignore b/Test.iOS/.gitignore
new file mode 100644
index 0000000..cbbd0b5
--- /dev/null
+++ b/Test.iOS/.gitignore
@@ -0,0 +1,2 @@
+bin/
+obj/
\ No newline at end of file
diff --git a/Examples/Projects/CustomPopUpDemo/AppDelegate.cs b/Test.iOS/AppDelegate.cs
similarity index 98%
rename from Examples/Projects/CustomPopUpDemo/AppDelegate.cs
rename to Test.iOS/AppDelegate.cs
index 2d69832..69a711f 100644
--- a/Examples/Projects/CustomPopUpDemo/AppDelegate.cs
+++ b/Test.iOS/AppDelegate.cs
@@ -1,7 +1,7 @@
 using Foundation;
 using UIKit;
 
-namespace CustomPopUpDemo
+namespace Test.iOS
 {
     // The UIApplicationDelegate for the application. This class is responsible for launching the
     // User Interface of the application, as well as listening (and optionally responding) to application events from iOS.
@@ -17,6 +17,7 @@ public bool FinishedLaunching(UIApplication application, NSDictionary launchOpti
         {
             // Override point for customization after application launch.
             // If not required for your application you can safely delete this method
+
             return true;
         }
 
diff --git a/Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Contents.json b/Test.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to Test.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon1024.png b/Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon1024.png
similarity index 100%
rename from Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon1024.png
rename to Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon1024.png
diff --git a/Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon120.png b/Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon120.png
similarity index 100%
rename from Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon120.png
rename to Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon120.png
diff --git a/Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon152.png b/Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon152.png
similarity index 100%
rename from Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon152.png
rename to Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon152.png
diff --git a/Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon167.png b/Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon167.png
similarity index 100%
rename from Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon167.png
rename to Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon167.png
diff --git a/Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon180.png b/Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon180.png
similarity index 100%
rename from Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon180.png
rename to Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon180.png
diff --git a/Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon20.png b/Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon20.png
similarity index 100%
rename from Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon20.png
rename to Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon20.png
diff --git a/Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon29.png b/Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon29.png
similarity index 100%
rename from Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon29.png
rename to Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon29.png
diff --git a/Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon40.png b/Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon40.png
similarity index 100%
rename from Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon40.png
rename to Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon40.png
diff --git a/Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon58.png b/Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon58.png
similarity index 100%
rename from Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon58.png
rename to Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon58.png
diff --git a/Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon60.png b/Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon60.png
similarity index 100%
rename from Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon60.png
rename to Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon60.png
diff --git a/Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon76.png b/Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon76.png
similarity index 100%
rename from Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon76.png
rename to Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon76.png
diff --git a/Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon80.png b/Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon80.png
similarity index 100%
rename from Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon80.png
rename to Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon80.png
diff --git a/Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon87.png b/Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon87.png
similarity index 100%
rename from Examples/Projects/CustomPopUpDemo/Assets.xcassets/AppIcon.appiconset/Icon87.png
rename to Test.iOS/Assets.xcassets/AppIcon.appiconset/Icon87.png
diff --git a/Examples/Projects/CustomPopUpDemo/Entitlements.plist b/Test.iOS/Entitlements.plist
similarity index 100%
rename from Examples/Projects/CustomPopUpDemo/Entitlements.plist
rename to Test.iOS/Entitlements.plist
diff --git a/Examples/Projects/CustomPopUpDemo/Info.plist b/Test.iOS/Info.plist
similarity index 87%
rename from Examples/Projects/CustomPopUpDemo/Info.plist
rename to Test.iOS/Info.plist
index 14af8d7..8f5b286 100644
--- a/Examples/Projects/CustomPopUpDemo/Info.plist
+++ b/Test.iOS/Info.plist
@@ -3,9 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDisplayName</key>
-	<string>CustomPopUpDemo</string>
+	<string>Test.iOS</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.companyname.CustomPopUpDemo</string>
+	<string>com.CustomPopUps.Test-iOS</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
@@ -32,7 +32,7 @@
 		</dict>
 	</dict>
 	<key>MinimumOSVersion</key>
-	<string>11.1</string>
+	<string>12.0</string>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>1</integer>
@@ -63,5 +63,9 @@
 	</array>
 	<key>XSAppIconAssets</key>
 	<string>Assets.xcassets/AppIcon.appiconset</string>
+	<key>NSCameraUsageDescription</key>
+	<string>Need to get a preety nice photo</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>Need to stalk you :)</string>
 </dict>
 </plist>
diff --git a/Examples/Projects/CustomPopUpDemo/LaunchScreen.storyboard b/Test.iOS/LaunchScreen.storyboard
similarity index 99%
rename from Examples/Projects/CustomPopUpDemo/LaunchScreen.storyboard
rename to Test.iOS/LaunchScreen.storyboard
index f18534b..5d2e905 100644
--- a/Examples/Projects/CustomPopUpDemo/LaunchScreen.storyboard
+++ b/Test.iOS/LaunchScreen.storyboard
@@ -24,4 +24,4 @@
             <point key="canvasLocation" x="53" y="375" />
         </scene>
     </scenes>
-</document>
\ No newline at end of file
+</document>
diff --git a/Examples/Projects/CustomPopUpDemo/Main.cs b/Test.iOS/Main.cs
similarity index 93%
rename from Examples/Projects/CustomPopUpDemo/Main.cs
rename to Test.iOS/Main.cs
index cf64215..fb48624 100644
--- a/Examples/Projects/CustomPopUpDemo/Main.cs
+++ b/Test.iOS/Main.cs
@@ -1,6 +1,6 @@
 using UIKit;
 
-namespace CustomPopUpDemo
+namespace Test.iOS
 {
     public class Application
     {
diff --git a/Test.iOS/Main.storyboard b/Test.iOS/Main.storyboard
new file mode 100644
index 0000000..28ab6b9
--- /dev/null
+++ b/Test.iOS/Main.storyboard
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="QsP-Vf-I56">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Navigation Controller-->
+        <scene sceneID="5qh-ak-oGz">
+            <objects>
+                <navigationController id="QsP-Vf-I56" sceneMemberID="viewController">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="1AQ-7y-SiW">
+                        <rect key="frame" x="0.0" y="44" width="414" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <connections>
+                        <segue destination="BYZ-38-t0r" kind="relationship" relationship="rootViewController" id="47V-Ih-nmT"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="pWi-cW-9si" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-1029" y="0.0"/>
+        </scene>
+        <!--View Controller-->
+        <scene sceneID="tne-QT-ifu">
+            <objects>
+                <viewController id="BYZ-38-t0r" customClass="ViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
+                        <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="zL4-iD-qsV"/>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="0.0" y="0.0"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/Test.iOS/Properties/AssemblyInfo.cs b/Test.iOS/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..ecd1820
--- /dev/null
+++ b/Test.iOS/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Test.iOS")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Test.iOS")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("50c7b8c9-e664-45af-b88e-0c9b8b9c1be1")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Examples/Projects/CustomPopUpDemo/Resources/LaunchScreen.xib b/Test.iOS/Resources/LaunchScreen.xib
similarity index 95%
rename from Examples/Projects/CustomPopUpDemo/Resources/LaunchScreen.xib
rename to Test.iOS/Resources/LaunchScreen.xib
index 77f6ec3..97f5e88 100644
--- a/Examples/Projects/CustomPopUpDemo/Resources/LaunchScreen.xib
+++ b/Test.iOS/Resources/LaunchScreen.xib
@@ -18,7 +18,7 @@
                     <color key="textColor" cocoaTouchSystemColor="darkTextColor" />
                     <nil key="highlightedColor" />
                 </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CustomPopUpDemo" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines"
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Test.iOS" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines"
                     minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
                     <rect key="frame" x="20" y="140" width="441" height="43" />
                     <fontDescription key="fontDescription" type="boldSystem" pointSize="36" />
diff --git a/Examples/Projects/CustomPopUpDemo/SceneDelegate.cs b/Test.iOS/SceneDelegate.cs
similarity index 99%
rename from Examples/Projects/CustomPopUpDemo/SceneDelegate.cs
rename to Test.iOS/SceneDelegate.cs
index 8b6f25f..985ace1 100644
--- a/Examples/Projects/CustomPopUpDemo/SceneDelegate.cs
+++ b/Test.iOS/SceneDelegate.cs
@@ -21,7 +21,7 @@ public void WillConnect(UIScene scene, UISceneSession session, UISceneConnection
 
         [Export("sceneDidDisconnect:")]
         public void DidDisconnect(UIScene scene)
-        { 
+        {
             // Called as the scene is being released by the system.
             // This occurs shortly after the scene enters the background, or when its session is discarded.
             // Release any resources associated with this scene that can be re-created the next time the scene connects.
diff --git a/Examples/Projects/CustomPopUpDemo/CustomPopUpDemo.csproj b/Test.iOS/Test.iOS.csproj
similarity index 91%
rename from Examples/Projects/CustomPopUpDemo/CustomPopUpDemo.csproj
rename to Test.iOS/Test.iOS.csproj
index b26a5bb..f0b9958 100644
--- a/Examples/Projects/CustomPopUpDemo/CustomPopUpDemo.csproj
+++ b/Test.iOS/Test.iOS.csproj
@@ -3,12 +3,12 @@
     <PropertyGroup>
         <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
         <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
-        <ProjectGuid>{92E46B7F-D10F-42C4-9DAF-C8F2E7335E70}</ProjectGuid>
+        <ProjectGuid>{A24D5A98-38DE-453D-B432-7A3C8CA92DC3}</ProjectGuid>
         <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
         <TemplateGuid>{edc1b0fa-90cd-4038-8fad-98fe74adb368}</TemplateGuid>
         <OutputType>Exe</OutputType>
-        <RootNamespace>CustomPopUpDemo</RootNamespace>
-        <AssemblyName>CustomPopUpDemo</AssemblyName>
+        <RootNamespace>Test.iOS</RootNamespace>
+        <AssemblyName>Test.iOS</AssemblyName>
         <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
         <MtouchEnableSGenConc>true</MtouchEnableSGenConc>
         <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
@@ -24,8 +24,9 @@
         <ErrorReport>prompt</ErrorReport>
         <WarningLevel>4</WarningLevel>
         <MtouchArch>x86_64</MtouchArch>
-        <MtouchLink>None</MtouchLink>
+        <MtouchLink>SdkOnly</MtouchLink>
         <MtouchDebug>true</MtouchDebug>
+        <CodesignKey>iPhone Developer</CodesignKey>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
         <DebugType>none</DebugType>
@@ -48,6 +49,7 @@
         <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
         <CodesignKey>iPhone Developer</CodesignKey>
         <MtouchDebug>true</MtouchDebug>
+        <MtouchLink>SdkOnly</MtouchLink>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
         <DebugType>none</DebugType>
@@ -58,6 +60,7 @@
         <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
         <MtouchArch>ARM64</MtouchArch>
         <CodesignKey>iPhone Developer</CodesignKey>
+        <MtouchLink>SdkOnly</MtouchLink>
     </PropertyGroup>
     <ItemGroup>
         <Reference Include="System" />
@@ -68,7 +71,7 @@
         <Reference Include="System.Numerics.Vectors" />
     </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
+      <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
     </ItemGroup>
     <ItemGroup>
         <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
@@ -116,7 +119,6 @@
     </ItemGroup>
     <ItemGroup>
         <Folder Include="Resources\" />
-        <Folder Include="CPopupLibrary\" />
     </ItemGroup>
     <ItemGroup>
         <InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -134,9 +136,12 @@
         <Compile Include="ViewController.designer.cs">
             <DependentUpon>ViewController.cs</DependentUpon>
         </Compile>
-        <Compile Include="CPopupLibrary\CustomPopUpViewController.cs" />
-        <Compile Include="CPopupLibrary\YourCustomizePopup.cs" />
-        <Compile Include="CPopupLibrary\PopUpsObjects.cs" />
+    </ItemGroup>
+    <ItemGroup>
+      <ProjectReference Include="..\CustomPopUps\CustomPopUps.csproj">
+        <Project>{E50C90AE-46EE-4D82-BA91-723EC7C9621D}</Project>
+        <Name>CustomPopUps</Name>
+      </ProjectReference>
     </ItemGroup>
     <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Test.iOS/ViewController.cs b/Test.iOS/ViewController.cs
new file mode 100644
index 0000000..bcae641
--- /dev/null
+++ b/Test.iOS/ViewController.cs
@@ -0,0 +1,100 @@
+using Foundation;
+using System;
+using System.Diagnostics;
+using UIKit;
+using CoreGraphics;
+using CustomPopUps;
+
+namespace Test.iOS
+{
+    public partial class ViewController : UIViewController
+    {
+        public UIFont Font { get; set; } = UIFont.FromName("Futura", 15);
+
+        public ViewController(IntPtr handle) : base(handle)
+        {
+            NavigationController.NavigationBarHidden = true;
+        }
+
+        public override void ViewDidLoad()
+        {
+            base.ViewDidLoad();
+
+            var button = new UIButton(UIButtonType.System);
+            var popup = GetFeaturesPopUp();
+
+            nfloat btnHeight = 40;
+            button.Frame = GetCenter(View, 140, btnHeight);
+            button.Font = Font;
+
+            button.SetTitle("Click to show popup!", UIControlState.Normal);
+            button.SetTitleColor(UIColor.Black, UIControlState.Normal);
+
+            button.TouchUpInside += (object sender, EventArgs e) => {
+                popup.Show();
+            };
+            View.AddSubview(button);
+        }
+
+        private PopUp GetFeaturesPopUp()
+        {
+            var size = new CGSize(300, 300);
+            var popup = new PopUp(size);
+
+            var closeButton = new UIButton(UIButtonType.System);
+            closeButton.Frame = new CGRect(90, popup.Frame.Height - 60, 120, 60);
+
+            closeButton.Font = Font;
+
+            closeButton.SetTitle("Close", UIControlState.Normal);
+            closeButton.SetTitleColor(UIColor.Red, UIControlState.Normal);
+
+            closeButton.TouchUpInside += (object sender, EventArgs e) =>
+            {
+                popup.Close();
+            };
+
+            var titleLabel = new UILabel() {
+                Frame = new CGRect(10, 10, 290, 50),
+                Text = "Hello in custom popups!",
+                Font = UIFont.FromName("Futura", 25),
+                TextColor = UIColor.Blue
+            };
+
+            var descriptionLabel = new UILabel()
+            {
+                Frame = new CGRect(10, 90, 290, 120),
+                Text = "All features and avaiblities are avaible on our Github",
+                Font = Font,
+                TextColor = UIColor.Black
+            };
+
+            descriptionLabel.LineBreakMode = UILineBreakMode.TailTruncation;
+            descriptionLabel.Lines = 0;
+
+            popup.AddSubview(titleLabel);
+            popup.AddSubview(descriptionLabel);
+            popup.AddSubview(closeButton);
+
+            popup.OnOpen += () =>
+            {
+                Debug.WriteLine("[INFO] PopUp is here!");
+            };
+
+            return popup;
+        }
+
+        private CGRect GetCenter(UIView view, nfloat width, nfloat height)
+            => new CGRect(0, view.Frame.Height / 2 + height + (height / 2), view.Frame.Width / 2 + width + (width / 2), height);
+
+        [Obsolete]
+        private CGRect GetBottomCenter(UIView view, nfloat width, nfloat height) =>
+            new CGRect(0, view.Frame.Height - height, view.Frame.Width / 2 + width, height);
+
+        public override void DidReceiveMemoryWarning()
+        {
+            base.DidReceiveMemoryWarning();
+            // Release any cached data, images, etc that aren't in use.
+        }
+    }
+}
\ No newline at end of file
diff --git a/Examples/Projects/CustomPopUpDemo/ViewController.designer.cs b/Test.iOS/ViewController.designer.cs
similarity index 93%
rename from Examples/Projects/CustomPopUpDemo/ViewController.designer.cs
rename to Test.iOS/ViewController.designer.cs
index bb992bd..0546539 100644
--- a/Examples/Projects/CustomPopUpDemo/ViewController.designer.cs
+++ b/Test.iOS/ViewController.designer.cs
@@ -9,7 +9,7 @@
 using System.CodeDom.Compiler;
 using UIKit;
 
-namespace CustomPopUpDemo
+namespace Test.iOS
 {
     [Register("ViewController")]
     partial class ViewController