diff --git a/Geta.OEmbed.sln b/Geta.OEmbed.sln
index 9fcb711..7ce13a6 100644
--- a/Geta.OEmbed.sln
+++ b/Geta.OEmbed.sln
@@ -50,6 +50,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Geta.VideoTools.Mp4", "src\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Geta.VideoTools.WebM", "src\Geta.VideoTools.WebM\Geta.VideoTools.WebM.csproj", "{7C293407-095E-4696-A394-DBF5C8ACD710}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Geta.OEmbed.Optimizely.UI", "src\Geta.OEmbed.Optimizely.UI\Geta.OEmbed.Optimizely.UI.csproj", "{55E639C5-6ECD-46AA-BDAF-2D5E5442BCEF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -108,6 +110,10 @@ Global
 		{7C293407-095E-4696-A394-DBF5C8ACD710}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7C293407-095E-4696-A394-DBF5C8ACD710}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7C293407-095E-4696-A394-DBF5C8ACD710}.Release|Any CPU.Build.0 = Release|Any CPU
+		{55E639C5-6ECD-46AA-BDAF-2D5E5442BCEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55E639C5-6ECD-46AA-BDAF-2D5E5442BCEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55E639C5-6ECD-46AA-BDAF-2D5E5442BCEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{55E639C5-6ECD-46AA-BDAF-2D5E5442BCEF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/Geta.OEmbed.Optimizely/ClientResources/CheckBoxWithLabel.js b/src/Geta.OEmbed.Optimizely.UI/ClientResources/CheckBoxWithLabel.js
similarity index 100%
rename from src/Geta.OEmbed.Optimizely/ClientResources/CheckBoxWithLabel.js
rename to src/Geta.OEmbed.Optimizely.UI/ClientResources/CheckBoxWithLabel.js
diff --git a/src/Geta.OEmbed.Optimizely/ClientResources/OEmbedEditor.js b/src/Geta.OEmbed.Optimizely.UI/ClientResources/OEmbedEditor.js
similarity index 100%
rename from src/Geta.OEmbed.Optimizely/ClientResources/OEmbedEditor.js
rename to src/Geta.OEmbed.Optimizely.UI/ClientResources/OEmbedEditor.js
diff --git a/src/Geta.OEmbed.Optimizely/ClientResources/styles/geta-oembed.css b/src/Geta.OEmbed.Optimizely.UI/ClientResources/styles/geta-oembed.css
similarity index 100%
rename from src/Geta.OEmbed.Optimizely/ClientResources/styles/geta-oembed.css
rename to src/Geta.OEmbed.Optimizely.UI/ClientResources/styles/geta-oembed.css
diff --git a/src/Geta.OEmbed.Optimizely/ClientResources/templates/CheckBoxWithLabel.html b/src/Geta.OEmbed.Optimizely.UI/ClientResources/templates/CheckBoxWithLabel.html
similarity index 100%
rename from src/Geta.OEmbed.Optimizely/ClientResources/templates/CheckBoxWithLabel.html
rename to src/Geta.OEmbed.Optimizely.UI/ClientResources/templates/CheckBoxWithLabel.html
diff --git a/src/Geta.OEmbed.Optimizely/ClientResources/templates/OEmbedEditor.html b/src/Geta.OEmbed.Optimizely.UI/ClientResources/templates/OEmbedEditor.html
similarity index 100%
rename from src/Geta.OEmbed.Optimizely/ClientResources/templates/OEmbedEditor.html
rename to src/Geta.OEmbed.Optimizely.UI/ClientResources/templates/OEmbedEditor.html
diff --git a/src/Geta.OEmbed.Optimizely.UI/Geta.OEmbed.Optimizely.UI.csproj b/src/Geta.OEmbed.Optimizely.UI/Geta.OEmbed.Optimizely.UI.csproj
new file mode 100644
index 0000000..b805657
--- /dev/null
+++ b/src/Geta.OEmbed.Optimizely.UI/Geta.OEmbed.Optimizely.UI.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <PackageId>Geta.OEmbed.Optimizely.UI</PackageId>
+    <Title>Geta oEmbed Optimizely UI Package</Title>
+    <Authors>Geta Digital</Authors>
+    <Company>Geta Digital</Company>
+    <PackageIcon>icon.png</PackageIcon>
+    <PackageIconUrl>https://cdn.geta.no/opensource/icons/Geta-logo-3.png</PackageIconUrl>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <Description>UI files for Geta Optimizely oEmbed package.</Description>
+    <PackageTags>Geta oEmbed Video Optimizely CMS</PackageTags>
+    <RepositoryType>Git</RepositoryType>
+    <RepositoryUrl>https://github.com/Geta/geta-oembed</RepositoryUrl>
+  </PropertyGroup>
+
+  <ImportGroup>
+    <Import Project="$(SolutionDir)\src\pack.proj" Condition="Exists('$(SolutionDir)\src\pack.proj')"/>
+  </ImportGroup>
+
+  <ItemGroup>
+    <None Include="..\..\resources\icon.png" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Geta.OEmbed.Optimizely\Geta.OEmbed.Optimizely.csproj" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Geta.OEmbed.Optimizely/module.config b/src/Geta.OEmbed.Optimizely.UI/module.config
similarity index 100%
rename from src/Geta.OEmbed.Optimizely/module.config
rename to src/Geta.OEmbed.Optimizely.UI/module.config
diff --git a/src/Geta.OEmbed.Optimizely/msbuild/CopyZipFiles.targets b/src/Geta.OEmbed.Optimizely.UI/msbuild/CopyZipFiles.targets
similarity index 100%
rename from src/Geta.OEmbed.Optimizely/msbuild/CopyZipFiles.targets
rename to src/Geta.OEmbed.Optimizely.UI/msbuild/CopyZipFiles.targets
diff --git a/src/Geta.OEmbed.Optimizely/Geta.OEmbed.Optimizely.csproj b/src/Geta.OEmbed.Optimizely/Geta.OEmbed.Optimizely.csproj
index 85135ca..eb263c4 100644
--- a/src/Geta.OEmbed.Optimizely/Geta.OEmbed.Optimizely.csproj
+++ b/src/Geta.OEmbed.Optimizely/Geta.OEmbed.Optimizely.csproj
@@ -24,7 +24,7 @@
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
 	</ItemGroup>
-	
+
   <ItemGroup>
 		<ProjectReference Include="..\Geta.OEmbed.AspNetCore.Mvc\Geta.OEmbed.AspNetCore.Mvc.csproj" />
 		<ProjectReference Include="..\Geta.OEmbed.Client\Geta.OEmbed.Client.csproj" />
@@ -32,10 +32,6 @@
 		<ProjectReference Include="..\Geta.VideoTools.Mp4\Geta.VideoTools.Mp4.csproj" />
 		<ProjectReference Include="..\Geta.VideoTools.WebM\Geta.VideoTools.WebM.csproj" />
   </ItemGroup>
-	
-	<ImportGroup>
-		<Import Project="$(SolutionDir)\src\pack.proj" Condition="Exists('$(SolutionDir)\src\pack.proj')" />
-	</ImportGroup>
 
 	<ItemGroup>
 		<InternalsVisibleTo Include="$(AssemblyName).Tests" />
@@ -45,4 +41,4 @@
 		<None Include="..\..\resources\icon.png" Pack="true" PackagePath="\" />
 	</ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/pack.proj b/src/pack.proj
index cf7d102..88e645f 100644
--- a/src/pack.proj
+++ b/src/pack.proj
@@ -23,6 +23,7 @@
   <PropertyGroup>
     <SolutionDir Condition="$(SolutionDir) == ''">$(MSBuildProjectDirectory)\..\</SolutionDir>
     <TmpOutDir>$(SolutionDir)\tmp\$(TargetFramework)</TmpOutDir>
+    <ModuleName>Geta.OEmbed.Optimizely</ModuleName>
   </PropertyGroup>
 
   <Target Name="CreateZip" AfterTargets="Build">
@@ -35,29 +36,29 @@
     <XmlPoke XmlInputPath="$(TmpOutDir)\content\module.config" Query="/module/@clientResourceRelativePath" Value="$(Version)" />
     <ZipDirectory
       InputPath="$(TmpOutDir)\content"
-      OutputFileName="$(OutputPath)\$(MSBuildProjectName).zip"
+      OutputFileName="$(OutputPath)\$(ModuleName).zip"
       OverwriteExistingFile="true" />
      <RemoveDir Directories="$(TmpOutDir)" />
   </Target>
 
   <ItemGroup>
-    <Content Include="$(OutputPath)\$(MSBuildProjectName).zip" >
+    <Content Include="$(OutputPath)\$(ModuleName).zip" >
       <Pack>true</Pack>
-      <PackagePath>content\modules\_protected\$(MSBuildProjectName)\;contentFiles\any\any\modules\_protected\$(MSBuildProjectName)\</PackagePath>
+      <PackagePath>content\modules\_protected\$(ModuleName)\;contentFiles\any\any\modules\_protected\$(ModuleName)\</PackagePath>
       <PackageCopyToOutput>true</PackageCopyToOutput>
       <BuildAction>None</BuildAction>
     </Content>
     <Content Include="$(SolutionDir)\src\$(MSBuildProjectName)\msbuild\CopyZipFiles.targets" >
       <Pack>true</Pack>
-      <PackagePath>build\net5.0\$(MSBuildProjectName).targets</PackagePath>
+      <PackagePath>build\net5.0\$(ModuleName).targets</PackagePath>
       <PackageCopyToOutput>true</PackageCopyToOutput>
       <BuildAction>None</BuildAction>
     </Content>
 	<Content Include="$(SolutionDir)\src\$(MSBuildProjectName)\msbuild\CopyZipFiles.targets" >
 		<Pack>true</Pack>
-		<PackagePath>build\net6.0\$(MSBuildProjectName).targets</PackagePath>
+		<PackagePath>build\net6.0\$(ModuleName).targets</PackagePath>
 		<PackageCopyToOutput>true</PackageCopyToOutput>
 		<BuildAction>None</BuildAction>
 	</Content>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file