diff --git a/AWS/Kitsune.Identifier/Kitsune.Identifier.csproj b/AWS/Kitsune.Identifier/Kitsune.Identifier.csproj
index c55cea6..2c822a2 100644
--- a/AWS/Kitsune.Identifier/Kitsune.Identifier.csproj
+++ b/AWS/Kitsune.Identifier/Kitsune.Identifier.csproj
@@ -17,7 +17,7 @@
 		<PackageReference Include="AWSSDK.Lambda" Version="3.7.3.2" />
 		<PackageReference Include="AWSSDK.S3" Version="3.7.1.25" />
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.36" />
-		<PackageReference Include="Kitsune.Models" Version="1.0.8" />
+		<PackageReference Include="Kitsune.Models" Version="3.0.2" />
 		<PackageReference Include="MessagePack" Version="2.3.75" />
 <!--		<PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0" />-->
 		<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.2.0" />
diff --git a/AliCloud/KLM.AliCloud.Web/KLM.Web.csproj b/AliCloud/KLM.AliCloud.Web/KLM.Web.csproj
index 443cea6..06ca6db 100644
--- a/AliCloud/KLM.AliCloud.Web/KLM.Web.csproj
+++ b/AliCloud/KLM.AliCloud.Web/KLM.Web.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Kitsune.Models" Version="1.0.8" />
+    <PackageReference Include="Kitsune.Models" Version="3.0.2" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.11.1" />
     <PackageReference Include="NewRelic.Agent" Version="8.41.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
diff --git a/Common/FloatingpointLayoutManager/FloatingpointLayoutManager.csproj b/Common/FloatingpointLayoutManager/FloatingpointLayoutManager.csproj
index 4a6e850..fb873a4 100644
--- a/Common/FloatingpointLayoutManager/FloatingpointLayoutManager.csproj
+++ b/Common/FloatingpointLayoutManager/FloatingpointLayoutManager.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>1.0.1</Version>
+    <Version>3.0.2</Version>
     <Authors>Devesh Kumar</Authors>
     <Company>Kitsune</Company>
     <Copyright>Copyright ©  2021</Copyright>
@@ -22,20 +22,23 @@
     <LangVersion>default</LangVersion>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>bin\Debug\KitsuneLayoutManager.xml</DocumentationFile>
-    <RepositoryUrl>https://github.com/nowfloats/kitsune-application-runtime</RepositoryUrl>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>bin\Release\KitsuneLayoutManager.xml</DocumentationFile>
+    <RepositoryUrl>git@github.com:nowfloats/kitsune-application-runtime.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AWSSDK.Core" Version="3.7.3.1" />
     <PackageReference Include="AWSSDK.Kinesis" Version="3.7.0.53" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.36" />
-    <PackageReference Include="Kitsune.Helper" Version="1.0.3" />
-    <PackageReference Include="Kitsune.Models" Version="1.0.8" />
-    <PackageReference Include="KitsuneAntlrLibrary" Version="1.0.3" />
-    <PackageReference Include="KitsuneSyntaxParser" Version="1.0.4" />
+    <PackageReference Include="Kitsune.AntlrLibrary" Version="3.0.2" />
+    <PackageReference Include="Kitsune.Helper" Version="3.0.2" />
+    <PackageReference Include="Kitsune.Language" Version="3.0.2" />
+    <PackageReference Include="Kitsune.Models" Version="3.0.2" />
+    <PackageReference Include="Kitsune.Server.Model" Version="3.0.2" />
+    <PackageReference Include="Kitsune.SyntaxParser" Version="3.0.2" />
     <PackageReference Include="MessagePack" Version="2.3.75" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="3.1.19" />
@@ -48,10 +51,4 @@
     <Folder Include="Properties\" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Kitsune.Server.Model">
-      <HintPath>Kitsune.Server.Model.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>
diff --git a/Common/FloatingpointLayoutManager/Helper/BlockLevelExpressionEvaluator.cs b/Common/FloatingpointLayoutManager/Helper/BlockLevelExpressionEvaluator.cs
index 571ca07..4268dbe 100644
--- a/Common/FloatingpointLayoutManager/Helper/BlockLevelExpressionEvaluator.cs
+++ b/Common/FloatingpointLayoutManager/Helper/BlockLevelExpressionEvaluator.cs
@@ -1,9 +1,9 @@
-using KitsuneAntlrLibrary;
-using KitsuneAntlrLibrary.Model;
+using Kitsune.AntlrLibrary;
+using Kitsune.AntlrLibrary.Model;
 using Kitsune.Language.Models;
 using Kitsune.Server.Model.Kitsune;
-using KitsuneSyntaxParser;
-using KitsuneSyntaxParser.Models;
+using Kitsune.SyntaxParser;
+using Kitsune.SyntaxParser.Models;
 using KitsuneLayoutManager.Models;
 using Microsoft.CSharp.RuntimeBinder;
 using Newtonsoft.Json;
diff --git a/Common/FloatingpointLayoutManager/Helper/BlockLevelKLMExecutor.cs b/Common/FloatingpointLayoutManager/Helper/BlockLevelKLMExecutor.cs
index e54ee2f..11b2b01 100644
--- a/Common/FloatingpointLayoutManager/Helper/BlockLevelKLMExecutor.cs
+++ b/Common/FloatingpointLayoutManager/Helper/BlockLevelKLMExecutor.cs
@@ -1,5 +1,5 @@
-using KitsuneAntlrLibrary;
-using KitsuneAntlrLibrary.Model;
+using Kitsune.AntlrLibrary;
+using Kitsune.AntlrLibrary.Model;
 using Kitsune.Language.Models;
 using Kitsune.Models;
 using Kitsune.Models.KLM;
diff --git a/Common/FloatingpointLayoutManager/Helper/ExpressionEvaluator.cs b/Common/FloatingpointLayoutManager/Helper/ExpressionEvaluator.cs
index 706d4ce..0a51049 100644
--- a/Common/FloatingpointLayoutManager/Helper/ExpressionEvaluator.cs
+++ b/Common/FloatingpointLayoutManager/Helper/ExpressionEvaluator.cs
@@ -1,9 +1,9 @@
-using KitsuneAntlrLibrary;
-using KitsuneAntlrLibrary.Model;
+using Kitsune.AntlrLibrary;
+using Kitsune.AntlrLibrary.Model;
 using Kitsune.Language.Models;
 using Kitsune.Server.Model.Kitsune;
-using KitsuneSyntaxParser;
-using KitsuneSyntaxParser.Models;
+using Kitsune.SyntaxParser;
+using Kitsune.SyntaxParser.Models;
 using Microsoft.CSharp.RuntimeBinder;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
diff --git a/Common/FloatingpointLayoutManager/Helper/TagProcessors/KDLProcessor.cs b/Common/FloatingpointLayoutManager/Helper/TagProcessors/KDLProcessor.cs
index 2cb22e7..db7ec49 100644
--- a/Common/FloatingpointLayoutManager/Helper/TagProcessors/KDLProcessor.cs
+++ b/Common/FloatingpointLayoutManager/Helper/TagProcessors/KDLProcessor.cs
@@ -41,7 +41,7 @@ public override void Process(ref HtmlNode node, HtmlAttribute dynamicAttribute,
                     baseObj = null;
                     try
                     {
-                        objects = KitsuneSyntaxParser.Parser.GetObjects(Helper.TrimDelimiters(attr.Value));
+                        objects = Kitsune.SyntaxParser.Parser.GetObjects(Helper.TrimDelimiters(attr.Value));
 
                         foreach (var obj in objects)
                         {
diff --git a/Common/FloatingpointLayoutManager/Helper/TagProcessors/KObjectProcessor.cs b/Common/FloatingpointLayoutManager/Helper/TagProcessors/KObjectProcessor.cs
index 9241872..44b24d0 100644
--- a/Common/FloatingpointLayoutManager/Helper/TagProcessors/KObjectProcessor.cs
+++ b/Common/FloatingpointLayoutManager/Helper/TagProcessors/KObjectProcessor.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
-using KitsuneAntlrLibrary;
-using KitsuneAntlrLibrary.Model;
+using Kitsune.AntlrLibrary;
+using Kitsune.AntlrLibrary.Model;
 using HtmlAgilityPack;
 using Kitsune.Language.Models;
 
diff --git a/Common/FloatingpointLayoutManager/Helper/TagProcessors/KRepeatProcessor.cs b/Common/FloatingpointLayoutManager/Helper/TagProcessors/KRepeatProcessor.cs
index 616056f..c76044f 100644
--- a/Common/FloatingpointLayoutManager/Helper/TagProcessors/KRepeatProcessor.cs
+++ b/Common/FloatingpointLayoutManager/Helper/TagProcessors/KRepeatProcessor.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
-using KitsuneAntlrLibrary;
-using KitsuneAntlrLibrary.Model;
+using Kitsune.AntlrLibrary;
+using Kitsune.AntlrLibrary.Model;
 using HtmlAgilityPack;
 using Kitsune.Language.Models;
 using Newtonsoft.Json;
diff --git a/Common/FloatingpointLayoutManager/Helper/WidgetHandler/DataHandler.cs b/Common/FloatingpointLayoutManager/Helper/WidgetHandler/DataHandler.cs
index df150e5..f4aab26 100644
--- a/Common/FloatingpointLayoutManager/Helper/WidgetHandler/DataHandler.cs
+++ b/Common/FloatingpointLayoutManager/Helper/WidgetHandler/DataHandler.cs
@@ -17,7 +17,7 @@
 using Newtonsoft.Json;
 using System.Collections;
 using System.Diagnostics;
-using KitsuneSyntaxParser;
+using Kitsune.SyntaxParser;
 using System.Dynamic;
 
 namespace KitsuneLayoutManager.Helper.WidgetHandler
diff --git a/Common/FloatingpointLayoutManager/Helper/WidgetHandler/KScriptHandler.cs b/Common/FloatingpointLayoutManager/Helper/WidgetHandler/KScriptHandler.cs
index 4e13afa..db53e95 100644
--- a/Common/FloatingpointLayoutManager/Helper/WidgetHandler/KScriptHandler.cs
+++ b/Common/FloatingpointLayoutManager/Helper/WidgetHandler/KScriptHandler.cs
@@ -1,6 +1,6 @@
 using HtmlAgilityPack;
 using Kitsune.Helper;
-using KitsuneSyntaxParser;
+using Kitsune.SyntaxParser;
 using KitsuneLayoutManager.Models;
 using Microsoft.CSharp.RuntimeBinder;
 using System;
diff --git a/Common/FloatingpointLayoutManager/Helper/WidgetHandler/RepeatHelper.cs b/Common/FloatingpointLayoutManager/Helper/WidgetHandler/RepeatHelper.cs
index dd2cb47..29b0e1e 100644
--- a/Common/FloatingpointLayoutManager/Helper/WidgetHandler/RepeatHelper.cs
+++ b/Common/FloatingpointLayoutManager/Helper/WidgetHandler/RepeatHelper.cs
@@ -6,7 +6,7 @@
 using HtmlAgilityPack;
 using Kitsune.Server.Model.Kitsune;
 using System.Text.RegularExpressions;
-using KitsuneSyntaxParser;
+using Kitsune.SyntaxParser;
 
 namespace KitsuneLayoutManager.Helper.WidgetHandler
 {
diff --git a/Common/FloatingpointLayoutManager/Kitsune.Server.Model.dll b/Common/FloatingpointLayoutManager/Kitsune.Server.Model.dll
deleted file mode 100644
index 0b95b39..0000000
Binary files a/Common/FloatingpointLayoutManager/Kitsune.Server.Model.dll and /dev/null differ