diff --git a/README.md b/README.md
index ca29317..f78e89c 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,2 @@
-Template in order to create a ellie marmalade.
\ No newline at end of file
+<!-- Provide an overview of what your template package does and how to get started.
+Consider previewing the README before uploading (https://learn.microsoft.com/en-us/nuget/nuget-org/package-readme-on-nuget-org#preview-your-readme). -->
\ No newline at end of file
diff --git a/.template.config/template.json b/content/ellie-marmalade/.template.config/template.json
similarity index 100%
rename from .template.config/template.json
rename to content/ellie-marmalade/.template.config/template.json
diff --git a/TestCanary.cs b/content/ellie-marmalade/TestCanary.cs
similarity index 100%
rename from TestCanary.cs
rename to content/ellie-marmalade/TestCanary.cs
diff --git a/cmds.yml b/content/ellie-marmalade/cmds.yml
similarity index 100%
rename from cmds.yml
rename to content/ellie-marmalade/cmds.yml
diff --git a/content/ellie-marmalade/ellie-marmalade.csproj b/content/ellie-marmalade/ellie-marmalade.csproj
new file mode 100644
index 0000000..7eae7c0
--- /dev/null
+++ b/content/ellie-marmalade/ellie-marmalade.csproj
@@ -0,0 +1,44 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+
+    <!-- Reduces some boilerplate in your .cs files -->
+    <ImplicitUsings>enable</ImplicitUsings>
+
+    <!--    &lt;!&ndash; Use latest .net features &ndash;&gt;-->
+    <!--    <LangVersion>preview</LangVersion>-->
+    <!--    <EnablePreviewFeatures>true</EnablePreviewFeatures>-->
+    <!--    <GenerateRequiresPreviewFeaturesAttribute>true</GenerateRequiresPreviewFeaturesAttribute>-->
+
+    <DebugType>Embedded</DebugType>
+    <!-- tell .net that this library will be used as a plugin -->
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+    
+   
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- Base marmalade package. You MUST reference this in order to have a working marmalade -->
+    <PackageReference Include="Ellie.Marmalade" Version="5.*-*">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+
+    <!-- Note: If you want to use EllieBot services etc... You will have to manually clone 
+      the https://toastielab.dev/Emotions-stuff/elliebot repo locally and reference the EllieBot.csproj because there is no EllieBot package atm.
+      It is strongly recommended that you checkout a specific tag which matches your version of ellie,
+      as there could be breaking changes even between minor versions of EllieBot.
+      For example if you're running EllieBot 4.1.0 locally for which you want to create a marmalade for,
+      you should do "git checkout 4.1.0" in your EllieBot solution and then reference the EllieBot.csproj
+    -->
+  </ItemGroup>
+
+  <!-- Copy shortcut and full strings to output (if they exist) -->
+  <ItemGroup>
+    <None Update="res.yml;cmds.yml;strings/**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include=".template.config\template.json" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/res.yml b/content/ellie-marmalade/res.yml
similarity index 100%
rename from res.yml
rename to content/ellie-marmalade/res.yml
diff --git a/ellie-marmalade.csproj b/ellie-marmalade.csproj
index 820dbca..4fe9632 100644
--- a/ellie-marmalade.csproj
+++ b/ellie-marmalade.csproj
@@ -1,50 +1,42 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-
-    <!-- Reduces some boilerplate in your .cs files -->
-    <ImplicitUsings>enable</ImplicitUsings>
-    
-    <!--    &lt;!&ndash; Use latest .net features &ndash;&gt;-->
-    <!--    <LangVersion>preview</LangVersion>-->
-    <!--    <EnablePreviewFeatures>true</EnablePreviewFeatures>-->
-    <!--    <GenerateRequiresPreviewFeaturesAttribute>true</GenerateRequiresPreviewFeaturesAttribute>-->
-
-    <DebugType>Embedded</DebugType>
-    <!-- tell .net that this library will be used as a plugin -->
-    <EnableDynamicLoading>true</EnableDynamicLoading>
-    
-    <PackageType>Template</PackageType>
+    <!-- The package metadata. Fill in the properties marked as TODO below -->
+    <!-- Follow the instructions on https://learn.microsoft.com/en-us/nuget/create-packages/package-authoring-best-practices -->
+    <PackageId>ellie_marmalade</PackageId>
     <PackageVersion>5.0.1</PackageVersion>
     <PackageId>ellie-marmalade</PackageId>
     <Title>Ellie Marmalade Template</Title>
     <Authors>EllieBot Team</Authors>
     <Description>Template in order to create a ellie marmalade.</Description>
     <PackageTags>dotnet-new;templates</PackageTags>
+    <PackageProjectUrl>https://toastielab.dev/Emotions-stuff/ellie-marmalade</PackageProjectUrl>
+
+    <!-- Keep package type as 'Template' to show the package as a template package on nuget.org and make your template available in dotnet new search.-->
+    <PackageType>Template</PackageType>
+    <TargetFramework>net8.0</TargetFramework>
+    <IncludeContentInPack>true</IncludeContentInPack>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <ContentTargetFolders>content</ContentTargetFolders>
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
+    <NoDefaultExcludes>true</NoDefaultExcludes>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
-  <ItemGroup>
-    <!-- Base marmalade package. You MUST reference this in order to have a working marmalade -->
-    <PackageReference Include="Ellie.Marmalade" Version="5.*-*">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-
-    <!-- Note: If you want to use EllieBot services etc... You will have to manually clone 
-      the https://toastielab.dev/Emotions-stuff/elliebot repo locally and reference the EllieBot.csproj because there is no EllieBot package atm.
-      It is strongly recommended that you checkout a specific tag which matches your version of ellie,
-      as there could be breaking changes even between minor versions of EllieBot.
-      For example if you're running EllieBot 4.1.0 locally for which you want to create a marmalade for,
-      you should do "git checkout 4.1.0" in your EllieBot solution and then reference the EllieBot.csproj
-    -->
-  </ItemGroup>
+  <PropertyGroup>
+    <LocalizeTemplates>false</LocalizeTemplates>
+  </PropertyGroup>
 
   <!-- Copy shortcut and full strings to output (if they exist) -->
   <ItemGroup>
-    <None Update="res.yml;cmds.yml;strings/**">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    <PackageReference Include="Microsoft.TemplateEngine.Tasks" Version="*" PrivateAssets="all" IsImplicitlyDefined="true"/>
   </ItemGroup>
   <ItemGroup>
-    <Content Include=".template.config\template.json" />
+    <Content Include="content\**\*" Exclude="content\**\bin\**;content\**\obj\**" />
+    <Compile Remove="**\*" />
   </ItemGroup>
-</Project>
+
+  <ItemGroup>
+    <None Include="README.md" Pack="true" PackagePath="" />
+  </ItemGroup>
+</Project>
\ No newline at end of file