diff --git a/.gitignore b/.gitignore
index b9d880a1..87f765f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,4 @@ src/PopForums.Web/wwwroot/lib/PopForums/dist/*
 node_modules
 src/PopForums.AzureKit.Functions/Properties/ServiceDependencies
 src/PopForums.Web/package-lock.json
-src/PopForums.Web/wwwroot/lib/PopForums/src/PopForums.js
+src/PopForums.Mvc/wwwroot/PopForums.js
diff --git a/src/PopForums.Mvc/Areas/Forums/Views/Shared/PopForumsMaster.cshtml b/src/PopForums.Mvc/Areas/Forums/Views/Shared/PopForumsMaster.cshtml
index c8291c8e..4b95f048 100644
--- a/src/PopForums.Mvc/Areas/Forums/Views/Shared/PopForumsMaster.cshtml
+++ b/src/PopForums.Mvc/Areas/Forums/Views/Shared/PopForumsMaster.cshtml
@@ -5,12 +5,12 @@
 @section HeaderContent {
 	<environment include="Development">
 		<script src="~/lib/signalr/dist/signalr.js" asp-append-version="true"></script>
-		<script src="~/lib/PopForums/src/PopForums.js" asp-append-version="true"></script>
+        <script src="~/_content/PopForums.Mvc/PopForums.js" asp-append-version="true"></script>
 		<link href="~/lib/PopForums/src/PopForums.css" rel="stylesheet" asp-append-version="true" />
 	</environment>
 	<environment exclude="Development">
 		<script src="~/lib/signalr/dist/signalr.min.js" asp-append-version="true"></script>
-		<script src="~/lib/PopForums/dist/PopForums.min.js" asp-append-version="true"></script>
+        <script src="~/_content/PopForums.Mvc/PopForums.js" asp-append-version="true"></script>
 		<link href="~/lib/PopForums/dist/PopForums.min.css" rel="stylesheet" asp-append-version="true" />
 	</environment>
 	@RenderSection("HeaderContent", required: false)
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/AnswerButton.ts b/src/PopForums.Mvc/Client/Components/AnswerButton.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/AnswerButton.ts
rename to src/PopForums.Mvc/Client/Components/AnswerButton.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/CommentButton.ts b/src/PopForums.Mvc/Client/Components/CommentButton.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/CommentButton.ts
rename to src/PopForums.Mvc/Client/Components/CommentButton.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/FavoriteButton.ts b/src/PopForums.Mvc/Client/Components/FavoriteButton.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/FavoriteButton.ts
rename to src/PopForums.Mvc/Client/Components/FavoriteButton.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/FormattedTime.ts b/src/PopForums.Mvc/Client/Components/FormattedTime.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/FormattedTime.ts
rename to src/PopForums.Mvc/Client/Components/FormattedTime.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/FullText.ts b/src/PopForums.Mvc/Client/Components/FullText.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/FullText.ts
rename to src/PopForums.Mvc/Client/Components/FullText.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/HomeUpdater.ts b/src/PopForums.Mvc/Client/Components/HomeUpdater.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/HomeUpdater.ts
rename to src/PopForums.Mvc/Client/Components/HomeUpdater.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/LoginForm.ts b/src/PopForums.Mvc/Client/Components/LoginForm.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/LoginForm.ts
rename to src/PopForums.Mvc/Client/Components/LoginForm.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/MorePostsBeforeReplyButton.ts b/src/PopForums.Mvc/Client/Components/MorePostsBeforeReplyButton.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/MorePostsBeforeReplyButton.ts
rename to src/PopForums.Mvc/Client/Components/MorePostsBeforeReplyButton.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/MorePostsButton.ts b/src/PopForums.Mvc/Client/Components/MorePostsButton.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/MorePostsButton.ts
rename to src/PopForums.Mvc/Client/Components/MorePostsButton.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/NotificationItem.ts b/src/PopForums.Mvc/Client/Components/NotificationItem.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/NotificationItem.ts
rename to src/PopForums.Mvc/Client/Components/NotificationItem.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/NotificationList.ts b/src/PopForums.Mvc/Client/Components/NotificationList.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/NotificationList.ts
rename to src/PopForums.Mvc/Client/Components/NotificationList.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/NotificationMarkAllButton.ts b/src/PopForums.Mvc/Client/Components/NotificationMarkAllButton.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/NotificationMarkAllButton.ts
rename to src/PopForums.Mvc/Client/Components/NotificationMarkAllButton.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/NotificationToggle.ts b/src/PopForums.Mvc/Client/Components/NotificationToggle.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/NotificationToggle.ts
rename to src/PopForums.Mvc/Client/Components/NotificationToggle.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/PMCount.ts b/src/PopForums.Mvc/Client/Components/PMCount.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/PMCount.ts
rename to src/PopForums.Mvc/Client/Components/PMCount.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/PMForm.ts b/src/PopForums.Mvc/Client/Components/PMForm.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/PMForm.ts
rename to src/PopForums.Mvc/Client/Components/PMForm.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/PostMiniProfile.ts b/src/PopForums.Mvc/Client/Components/PostMiniProfile.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/PostMiniProfile.ts
rename to src/PopForums.Mvc/Client/Components/PostMiniProfile.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/PostModerationLogButton.ts b/src/PopForums.Mvc/Client/Components/PostModerationLogButton.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/PostModerationLogButton.ts
rename to src/PopForums.Mvc/Client/Components/PostModerationLogButton.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/PreviewButton.ts b/src/PopForums.Mvc/Client/Components/PreviewButton.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/PreviewButton.ts
rename to src/PopForums.Mvc/Client/Components/PreviewButton.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/PreviousPostsButton.ts b/src/PopForums.Mvc/Client/Components/PreviousPostsButton.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/PreviousPostsButton.ts
rename to src/PopForums.Mvc/Client/Components/PreviousPostsButton.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/QuoteButton.ts b/src/PopForums.Mvc/Client/Components/QuoteButton.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/QuoteButton.ts
rename to src/PopForums.Mvc/Client/Components/QuoteButton.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/ReplyButton.ts b/src/PopForums.Mvc/Client/Components/ReplyButton.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/ReplyButton.ts
rename to src/PopForums.Mvc/Client/Components/ReplyButton.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/ReplyForm.ts b/src/PopForums.Mvc/Client/Components/ReplyForm.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/ReplyForm.ts
rename to src/PopForums.Mvc/Client/Components/ReplyForm.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/SearchNavForm.ts b/src/PopForums.Mvc/Client/Components/SearchNavForm.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/SearchNavForm.ts
rename to src/PopForums.Mvc/Client/Components/SearchNavForm.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/SubscribeButton.ts b/src/PopForums.Mvc/Client/Components/SubscribeButton.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/SubscribeButton.ts
rename to src/PopForums.Mvc/Client/Components/SubscribeButton.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/TopicButton.ts b/src/PopForums.Mvc/Client/Components/TopicButton.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/TopicButton.ts
rename to src/PopForums.Mvc/Client/Components/TopicButton.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/TopicForm.ts b/src/PopForums.Mvc/Client/Components/TopicForm.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/TopicForm.ts
rename to src/PopForums.Mvc/Client/Components/TopicForm.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/TopicModerationLogButton.ts b/src/PopForums.Mvc/Client/Components/TopicModerationLogButton.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/TopicModerationLogButton.ts
rename to src/PopForums.Mvc/Client/Components/TopicModerationLogButton.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/VoteCount.ts b/src/PopForums.Mvc/Client/Components/VoteCount.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Components/VoteCount.ts
rename to src/PopForums.Mvc/Client/Components/VoteCount.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Declarations.ts b/src/PopForums.Mvc/Client/Declarations.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Declarations.ts
rename to src/PopForums.Mvc/Client/Declarations.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/ElementBase.ts b/src/PopForums.Mvc/Client/ElementBase.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/ElementBase.ts
rename to src/PopForums.Mvc/Client/ElementBase.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Models/Notification.ts b/src/PopForums.Mvc/Client/Models/Notification.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Models/Notification.ts
rename to src/PopForums.Mvc/Client/Models/Notification.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Models/PrivateMessage.ts b/src/PopForums.Mvc/Client/Models/PrivateMessage.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Models/PrivateMessage.ts
rename to src/PopForums.Mvc/Client/Models/PrivateMessage.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Models/PrivateMessageUser.ts b/src/PopForums.Mvc/Client/Models/PrivateMessageUser.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Models/PrivateMessageUser.ts
rename to src/PopForums.Mvc/Client/Models/PrivateMessageUser.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Services/LocalizationService.ts b/src/PopForums.Mvc/Client/Services/LocalizationService.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Services/LocalizationService.ts
rename to src/PopForums.Mvc/Client/Services/LocalizationService.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Services/NotificationService.ts b/src/PopForums.Mvc/Client/Services/NotificationService.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/Services/NotificationService.ts
rename to src/PopForums.Mvc/Client/Services/NotificationService.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/State/ForumState.ts b/src/PopForums.Mvc/Client/State/ForumState.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/State/ForumState.ts
rename to src/PopForums.Mvc/Client/State/ForumState.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/State/Localizations.ts b/src/PopForums.Mvc/Client/State/Localizations.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/State/Localizations.ts
rename to src/PopForums.Mvc/Client/State/Localizations.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/State/PrivateMessageState.ts b/src/PopForums.Mvc/Client/State/PrivateMessageState.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/State/PrivateMessageState.ts
rename to src/PopForums.Mvc/Client/State/PrivateMessageState.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/State/TopicState.ts b/src/PopForums.Mvc/Client/State/TopicState.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/State/TopicState.ts
rename to src/PopForums.Mvc/Client/State/TopicState.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/State/UserState.ts b/src/PopForums.Mvc/Client/State/UserState.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/State/UserState.ts
rename to src/PopForums.Mvc/Client/State/UserState.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/StateBase.ts b/src/PopForums.Mvc/Client/StateBase.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/StateBase.ts
rename to src/PopForums.Mvc/Client/StateBase.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/WatchPropertyAttribute.ts b/src/PopForums.Mvc/Client/WatchPropertyAttribute.ts
similarity index 100%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/WatchPropertyAttribute.ts
rename to src/PopForums.Mvc/Client/WatchPropertyAttribute.ts
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/tsconfig.json b/src/PopForums.Mvc/Client/tsconfig.json
similarity index 86%
rename from src/PopForums.Web/wwwroot/lib/PopForums/src/Client/tsconfig.json
rename to src/PopForums.Mvc/Client/tsconfig.json
index d2015d24..542e7124 100644
--- a/src/PopForums.Web/wwwroot/lib/PopForums/src/Client/tsconfig.json
+++ b/src/PopForums.Mvc/Client/tsconfig.json
@@ -4,7 +4,7 @@
     "target": "es2018",
     "inlineSources": true,
     "inlineSourceMap": true,
-    "outFile": "../PopForums.js",
+    "outFile": "../wwwroot/PopForums.js",
     "experimentalDecorators": true,
     "noImplicitAny": true,
     "suppressImplicitAnyIndexErrors": true,
diff --git a/src/PopForums.Mvc/PopForums.Mvc.csproj b/src/PopForums.Mvc/PopForums.Mvc.csproj
index 22408f06..dda99f3a 100644
--- a/src/PopForums.Mvc/PopForums.Mvc.csproj
+++ b/src/PopForums.Mvc/PopForums.Mvc.csproj
@@ -13,10 +13,16 @@
 		<RepositoryUrl>https://github.com/POPWorldMedia/POPForums</RepositoryUrl>
 		<Copyright>2022, POP World Media, LLC</Copyright>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<!--This is an important line to trigger the hot reload:-->
+		<AssignTargetPathsDependsOn>CompileTypeScript;$(AssignTargetPathsDependsOn)</AssignTargetPathsDependsOn>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
+		<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.8.2">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 		<PackageReference Include="PopIdentity" Version="3.0.0" />
 	</ItemGroup>
 
@@ -24,4 +30,9 @@
 		<ProjectReference Include="..\PopForums\PopForums.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Folder Include="Client\" />
+	  <Folder Include="wwwroot\" />
+	</ItemGroup>
+
 </Project>
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/package.json b/src/PopForums.Web/wwwroot/lib/PopForums/package.json
index a4acf18b..6a646773 100644
--- a/src/PopForums.Web/wwwroot/lib/PopForums/package.json
+++ b/src/PopForums.Web/wwwroot/lib/PopForums/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@popworldmedia/popforums",
-  "version": "19.0.0-prerelease.355",
+  "version": "19.0.0-prerelease.357",
   "description": "POP Forums client side",
   "scripts": {},
   "repository": {