diff --git a/src/IconPacks.Avalonia.BoxIcons/Converter/PackIconBoxIconsKindToImageConverter.cs b/src/IconPacks.Avalonia.BoxIcons/Converter/PackIconBoxIconsKindToImageConverter.cs
index d1af494..9514947 100644
--- a/src/IconPacks.Avalonia.BoxIcons/Converter/PackIconBoxIconsKindToImageConverter.cs
+++ b/src/IconPacks.Avalonia.BoxIcons/Converter/PackIconBoxIconsKindToImageConverter.cs
@@ -1,6 +1,8 @@
 using Avalonia.Media;
+using IconPacks.Avalonia.Core;
+using IconPacks.Avalonia.Core.Converter;
 
-namespace IconPacks.Avalonia.Converter
+namespace IconPacks.Avalonia.BoxIcons.Converter
 {
     public class PackIconBoxIconsKindToImageConverter : PackIconKindToImageConverterBase
     {
diff --git a/src/IconPacks.Avalonia.BoxIcons/IconPacks.Avalonia.BoxIcons.csproj b/src/IconPacks.Avalonia.BoxIcons/IconPacks.Avalonia.BoxIcons.csproj
index f8a8ad9..bba35fe 100644
--- a/src/IconPacks.Avalonia.BoxIcons/IconPacks.Avalonia.BoxIcons.csproj
+++ b/src/IconPacks.Avalonia.BoxIcons/IconPacks.Avalonia.BoxIcons.csproj
@@ -5,7 +5,6 @@
         <IconsName>BoxIcons</IconsName>
         <AssemblyName>IconPacks.Avalonia.BoxIcons</AssemblyName>
         <Title>IconPacks.Avalonia.BoxIcons</Title>
-        <RootNamespace>IconPacks.Avalonia</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.axaml b/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.axaml
index d69a638..24c5c4f 100644
--- a/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.axaml
+++ b/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:iconPacks="urn:iconpacks-avalonia"
+                    xmlns:iconPacks="https://github.com/MahApps/IconPacks.Avalonia"
                     x:ClassModifier="internal">
 
     <Design.PreviewWith>
diff --git a/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.cs b/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.cs
index e4dd776..61e4c49 100644
--- a/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.cs
+++ b/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.cs
@@ -1,8 +1,9 @@
 using Avalonia;
 using Avalonia.Media;
-using IconPacks.Avalonia.Attributes;
+using IconPacks.Avalonia.Core;
+using IconPacks.Avalonia.Core.Attributes;
 
-namespace IconPacks.Avalonia
+namespace IconPacks.Avalonia.BoxIcons
 {
     /// <summary>
     /// BoxIcons licensed under [SIL OFL 1.1](<see><cref>http://scripts.sil.org/OFL</cref></see>)
diff --git a/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIconsExtension.cs b/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIconsExtension.cs
index cdaad9f..50e9635 100644
--- a/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIconsExtension.cs
+++ b/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIconsExtension.cs
@@ -1,7 +1,8 @@
 using System;
 using Avalonia.Markup.Xaml;
+using IconPacks.Avalonia.Core;
 
-namespace IconPacks.Avalonia
+namespace IconPacks.Avalonia.BoxIcons
 {
     public class BoxIconsExtension : BasePackIconExtension
     {
diff --git a/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIconsImageExtension.cs b/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIconsImageExtension.cs
index b0dc18d..00f801a 100644
--- a/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIconsImageExtension.cs
+++ b/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIconsImageExtension.cs
@@ -1,8 +1,9 @@
 using System;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
+using IconPacks.Avalonia.Core;
 
-namespace IconPacks.Avalonia
+namespace IconPacks.Avalonia.BoxIcons
 {
     public class BoxIconsImageExtension : BasePackIconImageExtension
     {
diff --git a/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIconsKind.cs b/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIconsKind.cs
index db574c6..0998e01 100644
--- a/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIconsKind.cs
+++ b/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIconsKind.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace IconPacks.Avalonia
+namespace IconPacks.Avalonia.BoxIcons
 {
     /// ******************************************
     /// This code is auto generated. Do not amend.
diff --git a/src/IconPacks.Avalonia.BoxIcons/Properties/AssemblyInfo.cs b/src/IconPacks.Avalonia.BoxIcons/Properties/AssemblyInfo.cs
index be62d0c..f259604 100644
--- a/src/IconPacks.Avalonia.BoxIcons/Properties/AssemblyInfo.cs
+++ b/src/IconPacks.Avalonia.BoxIcons/Properties/AssemblyInfo.cs
@@ -1,6 +1,7 @@
 using Avalonia.Metadata;
 
-[assembly: XmlnsPrefix("urn:iconpacks-avalonia", "iconPacks")]
-[assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks")]
-[assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks.Avalonia")]
-[assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks.Avalonia.Converter")]
\ No newline at end of file
+[assembly: XmlnsPrefix("https://github.com/MahApps/IconPacks.Avalonia", "iconPacks")]
+[assembly: XmlnsDefinition("https://github.com/MahApps/IconPacks.Avalonia", "IconPacks")]
+[assembly: XmlnsDefinition("https://github.com/MahApps/IconPacks.Avalonia", "IconPacks.Avalonia")]
+[assembly: XmlnsDefinition("https://github.com/MahApps/IconPacks.Avalonia", "IconPacks.Avalonia.BoxIcons")]
+[assembly: XmlnsDefinition("https://github.com/MahApps/IconPacks.Avalonia", "IconPacks.Avalonia.BoxIcons.Converter")]
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.Core/Attributes/MetaDataAttribute.cs b/src/IconPacks.Avalonia.Core/Attributes/MetaDataAttribute.cs
index bd734ac..fcaf78d 100644
--- a/src/IconPacks.Avalonia.Core/Attributes/MetaDataAttribute.cs
+++ b/src/IconPacks.Avalonia.Core/Attributes/MetaDataAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace IconPacks.Avalonia.Attributes
+namespace IconPacks.Avalonia.Core.Attributes
 {
     /// <summary>
     /// Specifies meta data for a class.
diff --git a/src/IconPacks.Avalonia.Core/Converter/MarkupConverter.cs b/src/IconPacks.Avalonia.Core/Converter/MarkupConverter.cs
index d27841c..87d43e7 100644
--- a/src/IconPacks.Avalonia.Core/Converter/MarkupConverter.cs
+++ b/src/IconPacks.Avalonia.Core/Converter/MarkupConverter.cs
@@ -1,10 +1,10 @@
 using System;
-using Avalonia.Data.Converters;
-using Avalonia.Markup.Xaml;
 using System.Globalization;
 using Avalonia.Data;
+using Avalonia.Data.Converters;
+using Avalonia.Markup.Xaml;
 
-namespace IconPacks.Avalonia.Converter
+namespace IconPacks.Avalonia.Core.Converter
 {
     /// <summary>
     /// MarkupConverter is a MarkupExtension which can be used for IValueConverter.
diff --git a/src/IconPacks.Avalonia.Core/Converter/PackIconKindToImageConverterBase.cs b/src/IconPacks.Avalonia.Core/Converter/PackIconKindToImageConverterBase.cs
index ff0d2ff..ff75d8c 100644
--- a/src/IconPacks.Avalonia.Core/Converter/PackIconKindToImageConverterBase.cs
+++ b/src/IconPacks.Avalonia.Core/Converter/PackIconKindToImageConverterBase.cs
@@ -1,9 +1,8 @@
-using Avalonia.Media;
+using System;
 using System.Globalization;
-using System;
-using Avalonia.Data;
+using Avalonia.Media;
 
-namespace IconPacks.Avalonia.Converter
+namespace IconPacks.Avalonia.Core.Converter
 {
     public abstract class PackIconKindToImageConverterBase : MarkupConverter
     {
diff --git a/src/IconPacks.Avalonia.Core/IconPacks.Avalonia.Core.csproj b/src/IconPacks.Avalonia.Core/IconPacks.Avalonia.Core.csproj
index 9ddc771..bcaed3c 100644
--- a/src/IconPacks.Avalonia.Core/IconPacks.Avalonia.Core.csproj
+++ b/src/IconPacks.Avalonia.Core/IconPacks.Avalonia.Core.csproj
@@ -3,7 +3,6 @@
     <PropertyGroup>
         <AssemblyName>IconPacks.Avalonia.Core</AssemblyName>
         <Title>IconPacks.Avalonia.Core</Title>
-        <RootNamespace>IconPacks.Avalonia</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/IconPacks.Avalonia.Core/PackIconBase.cs b/src/IconPacks.Avalonia.Core/PackIconBase.cs
index 19aab2b..f259ba4 100644
--- a/src/IconPacks.Avalonia.Core/PackIconBase.cs
+++ b/src/IconPacks.Avalonia.Core/PackIconBase.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace IconPacks.Avalonia
+namespace IconPacks.Avalonia.Core
 {
     public abstract class PackIconBase : PathIcon
     {
diff --git a/src/IconPacks.Avalonia.Core/PackIconControlBase.axaml b/src/IconPacks.Avalonia.Core/PackIconControlBase.axaml
index 75fa42b..4350c2d 100644
--- a/src/IconPacks.Avalonia.Core/PackIconControlBase.axaml
+++ b/src/IconPacks.Avalonia.Core/PackIconControlBase.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:iconPacks="urn:iconpacks-avalonia"
+                    xmlns:iconPacks="https://github.com/MahApps/IconPacks.Avalonia"
                     x:ClassModifier="internal">
 
     <ControlTemplate x:Key="IconPacks.Avalonia.PackIconControlBase.Template" TargetType="iconPacks:PackIconControlBase">
diff --git a/src/IconPacks.Avalonia.Core/PackIconControlBase.cs b/src/IconPacks.Avalonia.Core/PackIconControlBase.cs
index 2b78932..3500318 100644
--- a/src/IconPacks.Avalonia.Core/PackIconControlBase.cs
+++ b/src/IconPacks.Avalonia.Core/PackIconControlBase.cs
@@ -10,7 +10,7 @@
 using Avalonia.Media;
 using Avalonia.Styling;
 
-namespace IconPacks.Avalonia
+namespace IconPacks.Avalonia.Core
 {
     /// <summary>
     /// Class PackIconControlBase which is the base class for any PackIcon control.
diff --git a/src/IconPacks.Avalonia.Core/PackIconDataFactory.cs b/src/IconPacks.Avalonia.Core/PackIconDataFactory.cs
index 52108a8..2c91f39 100644
--- a/src/IconPacks.Avalonia.Core/PackIconDataFactory.cs
+++ b/src/IconPacks.Avalonia.Core/PackIconDataFactory.cs
@@ -3,7 +3,7 @@
 using System.Collections.ObjectModel;
 using Avalonia.Platform;
 
-namespace IconPacks.Avalonia
+namespace IconPacks.Avalonia.Core
 {
     public static class PackIconDataFactory<TEnum> where TEnum : struct, Enum
     {
diff --git a/src/IconPacks.Avalonia.Core/PackIconExtension.cs b/src/IconPacks.Avalonia.Core/PackIconExtension.cs
index 0bbe335..0b84743 100644
--- a/src/IconPacks.Avalonia.Core/PackIconExtension.cs
+++ b/src/IconPacks.Avalonia.Core/PackIconExtension.cs
@@ -1,8 +1,8 @@
-using Avalonia.Animation.Easings;
-using System;
+using System;
+using Avalonia.Animation.Easings;
 using Avalonia.Markup.Xaml;
 
-namespace IconPacks.Avalonia
+namespace IconPacks.Avalonia.Core
 {
     public interface IPackIconExtension
     {
diff --git a/src/IconPacks.Avalonia.Core/PackIconFlipOrientation.cs b/src/IconPacks.Avalonia.Core/PackIconFlipOrientation.cs
index de04217..ba1c2ab 100644
--- a/src/IconPacks.Avalonia.Core/PackIconFlipOrientation.cs
+++ b/src/IconPacks.Avalonia.Core/PackIconFlipOrientation.cs
@@ -1,4 +1,4 @@
-namespace IconPacks.Avalonia
+namespace IconPacks.Avalonia.Core
 {
     /// <summary>
     /// Enum PackIconFlipOrientation for the Flip property of any PackIcon control.
diff --git a/src/IconPacks.Avalonia.Core/PackIconImageExtension.cs b/src/IconPacks.Avalonia.Core/PackIconImageExtension.cs
index 67b1f4b..e0c52ed 100644
--- a/src/IconPacks.Avalonia.Core/PackIconImageExtension.cs
+++ b/src/IconPacks.Avalonia.Core/PackIconImageExtension.cs
@@ -1,7 +1,7 @@
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 
-namespace IconPacks.Avalonia
+namespace IconPacks.Avalonia.Core
 {
     public abstract class BasePackIconImageExtension : MarkupExtension
     {
diff --git a/src/IconPacks.Avalonia.Core/Properties/AssemblyInfo.cs b/src/IconPacks.Avalonia.Core/Properties/AssemblyInfo.cs
index 6f34bdd..fed0cb1 100644
--- a/src/IconPacks.Avalonia.Core/Properties/AssemblyInfo.cs
+++ b/src/IconPacks.Avalonia.Core/Properties/AssemblyInfo.cs
@@ -1,6 +1,8 @@
 using Avalonia.Metadata;
 
-[assembly: XmlnsPrefix("urn:iconpacks-avalonia", "iconPacks")]
-[assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks")]
-[assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks.Avalonia")]
-[assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks.Avalonia.Attributes")]
\ No newline at end of file
+[assembly: XmlnsPrefix("https://github.com/MahApps/IconPacks.Avalonia", "iconPacks")]
+[assembly: XmlnsDefinition("https://github.com/MahApps/IconPacks.Avalonia", "IconPacks")]
+[assembly: XmlnsDefinition("https://github.com/MahApps/IconPacks.Avalonia", "IconPacks.Avalonia")]
+[assembly: XmlnsDefinition("https://github.com/MahApps/IconPacks.Avalonia", "IconPacks.Avalonia.Core")]
+[assembly: XmlnsDefinition("https://github.com/MahApps/IconPacks.Avalonia", "IconPacks.Avalonia.Core.Attributes")]
+[assembly: XmlnsDefinition("https://github.com/MahApps/IconPacks.Avalonia", "IconPacks.Avalonia.Core.Converter")]
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia/Converter/PackIconKindToImageConverter.cs b/src/IconPacks.Avalonia/Converter/PackIconKindToImageConverter.cs
index 8ab16ae..1068730 100644
--- a/src/IconPacks.Avalonia/Converter/PackIconKindToImageConverter.cs
+++ b/src/IconPacks.Avalonia/Converter/PackIconKindToImageConverter.cs
@@ -1,4 +1,7 @@
 using Avalonia.Media;
+using IconPacks.Avalonia.BoxIcons;
+using IconPacks.Avalonia.Core;
+using IconPacks.Avalonia.Core.Converter;
 
 namespace IconPacks.Avalonia.Converter
 {
diff --git a/src/IconPacks.Avalonia/IconPacks.Avalonia.csproj b/src/IconPacks.Avalonia/IconPacks.Avalonia.csproj
index 7b13bcd..5990636 100644
--- a/src/IconPacks.Avalonia/IconPacks.Avalonia.csproj
+++ b/src/IconPacks.Avalonia/IconPacks.Avalonia.csproj
@@ -4,7 +4,6 @@
         <DefineConstants>$(DefineConstants);ALL</DefineConstants>
         <AssemblyName>IconPacks.Avalonia</AssemblyName>
         <Title>IconPacks.Avalonia</Title>
-        <RootNamespace>IconPacks.Avalonia</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/IconPacks.Avalonia/PackIconControl.axaml b/src/IconPacks.Avalonia/PackIconControl.axaml
index 448bb4f..f5f10e6 100644
--- a/src/IconPacks.Avalonia/PackIconControl.axaml
+++ b/src/IconPacks.Avalonia/PackIconControl.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:iconPacks="urn:iconpacks-avalonia"
+                    xmlns:iconPacks="https://github.com/MahApps/IconPacks.Avalonia"
                     x:ClassModifier="internal">
 
     <Design.PreviewWith>
diff --git a/src/IconPacks.Avalonia/PackIconControl.cs b/src/IconPacks.Avalonia/PackIconControl.cs
index 45a588e..bd42bc4 100644
--- a/src/IconPacks.Avalonia/PackIconControl.cs
+++ b/src/IconPacks.Avalonia/PackIconControl.cs
@@ -1,10 +1,8 @@
 using System;
-using System.Windows;
 using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Metadata;
 using Avalonia.Media;
-using IconPacks.Avalonia;
+using IconPacks.Avalonia.BoxIcons;
+using IconPacks.Avalonia.Core;
 
 namespace IconPacks.Avalonia
 {
diff --git a/src/IconPacks.Avalonia/PackIconControlDataFactory.cs b/src/IconPacks.Avalonia/PackIconControlDataFactory.cs
index 4f2a23d..ea698cc 100644
--- a/src/IconPacks.Avalonia/PackIconControlDataFactory.cs
+++ b/src/IconPacks.Avalonia/PackIconControlDataFactory.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using IconPacks.Avalonia.BoxIcons;
+using IconPacks.Avalonia.Core;
 
 namespace IconPacks.Avalonia
 {
diff --git a/src/IconPacks.Avalonia/PackIconExtension.cs b/src/IconPacks.Avalonia/PackIconExtension.cs
index 1e7af81..0d0cf58 100644
--- a/src/IconPacks.Avalonia/PackIconExtension.cs
+++ b/src/IconPacks.Avalonia/PackIconExtension.cs
@@ -1,6 +1,8 @@
 using System;
 using Avalonia.Data;
 using Avalonia.Markup.Xaml;
+using IconPacks.Avalonia.BoxIcons;
+using IconPacks.Avalonia.Core;
 
 namespace IconPacks.Avalonia
 {
diff --git a/src/IconPacks.Avalonia/PackIconImageExtension.cs b/src/IconPacks.Avalonia/PackIconImageExtension.cs
index 43a499c..fbd2a14 100644
--- a/src/IconPacks.Avalonia/PackIconImageExtension.cs
+++ b/src/IconPacks.Avalonia/PackIconImageExtension.cs
@@ -1,6 +1,8 @@
 using System;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
+using IconPacks.Avalonia.BoxIcons;
+using IconPacks.Avalonia.Core;
 
 namespace IconPacks.Avalonia
 {
diff --git a/src/IconPacks.Avalonia/Properties/AssemblyInfo.cs b/src/IconPacks.Avalonia/Properties/AssemblyInfo.cs
index be62d0c..26b01ce 100644
--- a/src/IconPacks.Avalonia/Properties/AssemblyInfo.cs
+++ b/src/IconPacks.Avalonia/Properties/AssemblyInfo.cs
@@ -1,6 +1,6 @@
 using Avalonia.Metadata;
 
-[assembly: XmlnsPrefix("urn:iconpacks-avalonia", "iconPacks")]
-[assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks")]
-[assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks.Avalonia")]
-[assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks.Avalonia.Converter")]
\ No newline at end of file
+[assembly: XmlnsPrefix("https://github.com/MahApps/IconPacks.Avalonia", "iconPacks")]
+[assembly: XmlnsDefinition("https://github.com/MahApps/IconPacks.Avalonia", "IconPacks")]
+[assembly: XmlnsDefinition("https://github.com/MahApps/IconPacks.Avalonia", "IconPacks.Avalonia")]
+[assembly: XmlnsDefinition("https://github.com/MahApps/IconPacks.Avalonia", "IconPacks.Avalonia.Converter")]
\ No newline at end of file