diff --git a/sample/TypeShim.Sample.Client/.gitignore b/sample/.gitignore
similarity index 98%
rename from sample/TypeShim.Sample.Client/.gitignore
rename to sample/.gitignore
index b7447368..da2cd498 100644
--- a/sample/TypeShim.Sample.Client/.gitignore
+++ b/sample/.gitignore
@@ -97,7 +97,7 @@ temp/
 # Preserve root lock
 !package-lock.json
 # If individual workspace package-locks accidentally get created (npm -w install inside):
-@typeshim/*/package-lock.json
+@client/*/package-lock.json
 
 # -----------------------------
 # Misc bundler artifacts
diff --git a/sample/TypeShim.Sample.Client/@typeshim/app/index.html b/sample/@client/app/index.html
similarity index 92%
rename from sample/TypeShim.Sample.Client/@typeshim/app/index.html
rename to sample/@client/app/index.html
index 78f05e10..7bb81257 100644
--- a/sample/TypeShim.Sample.Client/@typeshim/app/index.html
+++ b/sample/@client/app/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@typeshim/app Demo</title>
+    <title>@client/app Demo</title>
 
     <!-- enable when using WasmFingerprintAssets=true on the dotnet wasm project-->
     <!-- <script type="importmap"></script> -->
diff --git a/sample/TypeShim.Sample.Client/@typeshim/app/package.json b/sample/@client/app/package.json
similarity index 71%
rename from sample/TypeShim.Sample.Client/@typeshim/app/package.json
rename to sample/@client/app/package.json
index 9c409c9c..869f8be8 100644
--- a/sample/TypeShim.Sample.Client/@typeshim/app/package.json
+++ b/sample/@client/app/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@typeshim/app",
+  "name": "@client/app",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
@@ -11,8 +11,5 @@
   },
   "keywords": [],
   "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@typeshim/people-ui": "*"
-  }
+  "license": "ISC"
 }
diff --git a/sample/TypeShim.Sample.Client/@typeshim/app/src/App.tsx b/sample/@client/app/src/App.tsx
similarity index 89%
rename from sample/TypeShim.Sample.Client/@typeshim/app/src/App.tsx
rename to sample/@client/app/src/App.tsx
index 83537014..bc625c5a 100644
--- a/sample/TypeShim.Sample.Client/@typeshim/app/src/App.tsx
+++ b/sample/@client/app/src/App.tsx
@@ -1,8 +1,8 @@
 import { useState } from 'react';
 import Home from './pages/Home';
 import People from './pages/People';
-import { TypeShimProvider } from '@typeshim/wasm-exports';
-import { AppProvider } from '@typeshim/people-ui';
+import { TypeShimProvider } from '@client/wasm-exports';
+import { AppProvider } from './people/AppProvider';
 
 type Page = 'home' | 'people';
 
@@ -28,7 +28,7 @@ function Content() {
                 display: 'flex',
                 gap: '1rem'
             }}>
-                <strong style={{ marginRight: '1rem' }}>@typeshim/app</strong>
+                <strong style={{ marginRight: '1rem' }}>@client/app</strong>
                 <nav style={{ display: 'flex', gap: '1rem' }}>
                     <a
                         href="#"
diff --git a/sample/TypeShim.Sample.Client/@typeshim/app/src/index.css b/sample/@client/app/src/index.css
similarity index 100%
rename from sample/TypeShim.Sample.Client/@typeshim/app/src/index.css
rename to sample/@client/app/src/index.css
diff --git a/sample/TypeShim.Sample.Client/@typeshim/app/src/main.tsx b/sample/@client/app/src/main.tsx
similarity index 100%
rename from sample/TypeShim.Sample.Client/@typeshim/app/src/main.tsx
rename to sample/@client/app/src/main.tsx
diff --git a/sample/TypeShim.Sample.Client/@typeshim/app/src/pages/Home.tsx b/sample/@client/app/src/pages/Home.tsx
similarity index 95%
rename from sample/TypeShim.Sample.Client/@typeshim/app/src/pages/Home.tsx
rename to sample/@client/app/src/pages/Home.tsx
index 3b319b06..c8291eb2 100644
--- a/sample/TypeShim.Sample.Client/@typeshim/app/src/pages/Home.tsx
+++ b/sample/@client/app/src/pages/Home.tsx
@@ -2,7 +2,7 @@
 export default function Home() {
     return (
     <div>
-        <h1>Welcome to @typeshim/app</h1>
+        <h1>Welcome to @client/app</h1>
         <p>This is a sample React app that demonstrates how TypeShim extends .NET &lt;&gt; Javascript interop with:</p>
         <ul>
             <li>Natural object semantics like:</li>
diff --git a/sample/TypeShim.Sample.Client/@typeshim/app/src/pages/People.tsx b/sample/@client/app/src/pages/People.tsx
similarity index 97%
rename from sample/TypeShim.Sample.Client/@typeshim/app/src/pages/People.tsx
rename to sample/@client/app/src/pages/People.tsx
index f9324e90..b492bb4a 100644
--- a/sample/TypeShim.Sample.Client/@typeshim/app/src/pages/People.tsx
+++ b/sample/@client/app/src/pages/People.tsx
@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { PeopleList, PeopleGrid } from '@typeshim/people-ui';
+import { PeopleList, PeopleGrid } from '../people';
 
 export default function People() {
     const [view, setView] = useState<'list' | 'grid'>('list');
diff --git a/sample/TypeShim.Sample.Client/@typeshim/people-ui/src/AppProvider.tsx b/sample/@client/app/src/people/AppProvider.tsx
similarity index 91%
rename from sample/TypeShim.Sample.Client/@typeshim/people-ui/src/AppProvider.tsx
rename to sample/@client/app/src/people/AppProvider.tsx
index 0aec6541..cded1ae9 100644
--- a/sample/TypeShim.Sample.Client/@typeshim/people-ui/src/AppProvider.tsx
+++ b/sample/@client/app/src/people/AppProvider.tsx
@@ -1,4 +1,4 @@
-import { PeopleApp } from '@typeshim/wasm-exports';
+import { PeopleApp } from '@client/wasm-exports';
 import { useMemo, ReactNode } from 'react';
 import AppContext from './appContext';
 
diff --git a/sample/TypeShim.Sample.Client/@typeshim/people-ui/src/PeopleGrid.tsx b/sample/@client/app/src/people/PeopleGrid.tsx
similarity index 96%
rename from sample/TypeShim.Sample.Client/@typeshim/people-ui/src/PeopleGrid.tsx
rename to sample/@client/app/src/people/PeopleGrid.tsx
index 01f57e80..cb20a4bf 100644
--- a/sample/TypeShim.Sample.Client/@typeshim/people-ui/src/PeopleGrid.tsx
+++ b/sample/@client/app/src/people/PeopleGrid.tsx
@@ -2,7 +2,7 @@
 
 import React, { useEffect, useState } from 'react';
 import { PersonCard } from './PersonCard';
-import type { Person } from '@typeshim/wasm-exports';
+import type { Person } from '@client/wasm-exports';
 import { PeopleRepository } from './PeopleRepository';
 import AppContext from './appContext';
 
diff --git a/sample/TypeShim.Sample.Client/@typeshim/people-ui/src/PeopleList.tsx b/sample/@client/app/src/people/PeopleList.tsx
similarity index 95%
rename from sample/TypeShim.Sample.Client/@typeshim/people-ui/src/PeopleList.tsx
rename to sample/@client/app/src/people/PeopleList.tsx
index 767db1b1..fc48a07a 100644
--- a/sample/TypeShim.Sample.Client/@typeshim/people-ui/src/PeopleList.tsx
+++ b/sample/@client/app/src/people/PeopleList.tsx
@@ -2,7 +2,7 @@
 
 import React, { useEffect, useState } from 'react';
 import { PersonCard } from './PersonCard';
-import type { Person } from '@typeshim/wasm-exports';
+import type { Person } from '@client/wasm-exports';
 import { PeopleRepository } from './PeopleRepository';
 import AppContext from './appContext';
 
diff --git a/sample/TypeShim.Sample.Client/@typeshim/people-ui/src/PeopleRepository.tsx b/sample/@client/app/src/people/PeopleRepository.tsx
similarity index 94%
rename from sample/TypeShim.Sample.Client/@typeshim/people-ui/src/PeopleRepository.tsx
rename to sample/@client/app/src/people/PeopleRepository.tsx
index 573f15a2..78e543b3 100644
--- a/sample/TypeShim.Sample.Client/@typeshim/people-ui/src/PeopleRepository.tsx
+++ b/sample/@client/app/src/people/PeopleRepository.tsx
@@ -1,4 +1,4 @@
-import { People, Person, PeopleProvider } from '@typeshim/wasm-exports';
+import { People, Person, PeopleProvider } from '@client/wasm-exports';
 
 export class PeopleRepository {
 
diff --git a/sample/TypeShim.Sample.Client/@typeshim/people-ui/src/PersonCard.tsx b/sample/@client/app/src/people/PersonCard.tsx
similarity index 98%
rename from sample/TypeShim.Sample.Client/@typeshim/people-ui/src/PersonCard.tsx
rename to sample/@client/app/src/people/PersonCard.tsx
index c63adf8d..3781257e 100644
--- a/sample/TypeShim.Sample.Client/@typeshim/people-ui/src/PersonCard.tsx
+++ b/sample/@client/app/src/people/PersonCard.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Person, Dog } from '@typeshim/wasm-exports';
+import { Person, Dog } from '@client/wasm-exports';
 import { PetChip } from './PetChip';
 
 export interface PersonCardProps {
diff --git a/sample/TypeShim.Sample.Client/@typeshim/people-ui/src/PetChip.tsx b/sample/@client/app/src/people/PetChip.tsx
similarity index 95%
rename from sample/TypeShim.Sample.Client/@typeshim/people-ui/src/PetChip.tsx
rename to sample/@client/app/src/people/PetChip.tsx
index 91093d33..92ac887a 100644
--- a/sample/TypeShim.Sample.Client/@typeshim/people-ui/src/PetChip.tsx
+++ b/sample/@client/app/src/people/PetChip.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Dog } from '@typeshim/wasm-exports';
+import { Dog } from '@client/wasm-exports';
 
 export interface PetChipProps {
   petProxy: Dog;
diff --git a/sample/TypeShim.Sample.Client/@typeshim/people-ui/src/appContext.ts b/sample/@client/app/src/people/appContext.ts
similarity index 69%
rename from sample/TypeShim.Sample.Client/@typeshim/people-ui/src/appContext.ts
rename to sample/@client/app/src/people/appContext.ts
index fc91afcf..6bd69278 100644
--- a/sample/TypeShim.Sample.Client/@typeshim/people-ui/src/appContext.ts
+++ b/sample/@client/app/src/people/appContext.ts
@@ -1,4 +1,4 @@
-import { PeopleApp } from '@typeshim/wasm-exports';
+import { PeopleApp } from '@client/wasm-exports';
 import React from 'react';
 
 const AppContext = React.createContext<PeopleApp>(undefined!);
diff --git a/sample/TypeShim.Sample.Client/@typeshim/people-ui/src/index.ts b/sample/@client/app/src/people/index.ts
similarity index 100%
rename from sample/TypeShim.Sample.Client/@typeshim/people-ui/src/index.ts
rename to sample/@client/app/src/people/index.ts
diff --git a/sample/TypeShim.Sample.Client/@typeshim/app/tsconfig.json b/sample/@client/app/tsconfig.json
similarity index 100%
rename from sample/TypeShim.Sample.Client/@typeshim/app/tsconfig.json
rename to sample/@client/app/tsconfig.json
diff --git a/sample/TypeShim.Sample.Client/@typeshim/app/tsconfig.node.json b/sample/@client/app/tsconfig.node.json
similarity index 100%
rename from sample/TypeShim.Sample.Client/@typeshim/app/tsconfig.node.json
rename to sample/@client/app/tsconfig.node.json
diff --git a/sample/TypeShim.Sample.Client/@typeshim/app/vite.config.ts b/sample/@client/app/vite.config.ts
similarity index 100%
rename from sample/TypeShim.Sample.Client/@typeshim/app/vite.config.ts
rename to sample/@client/app/vite.config.ts
diff --git a/sample/TypeShim.Sample.Client/@typeshim/wasm-exports/.gitignore b/sample/@client/wasm-exports/.gitignore
similarity index 100%
rename from sample/TypeShim.Sample.Client/@typeshim/wasm-exports/.gitignore
rename to sample/@client/wasm-exports/.gitignore
diff --git a/sample/TypeShim.Sample.Client/@typeshim/wasm-exports/TypeShimProvider.tsx b/sample/@client/wasm-exports/TypeShimProvider.tsx
similarity index 93%
rename from sample/TypeShim.Sample.Client/@typeshim/wasm-exports/TypeShimProvider.tsx
rename to sample/@client/wasm-exports/TypeShimProvider.tsx
index 5bc219de..082bc45e 100644
--- a/sample/TypeShim.Sample.Client/@typeshim/wasm-exports/TypeShimProvider.tsx
+++ b/sample/@client/wasm-exports/TypeShimProvider.tsx
@@ -1,4 +1,4 @@
-import { createWasmRuntime, TypeShimInitializer } from '@typeshim/wasm-exports';
+import { createWasmRuntime, TypeShimInitializer } from '@client/wasm-exports';
 import { ReactNode, useEffect, useState } from 'react';
 
 export interface AppProviderProps {
diff --git a/sample/TypeShim.Sample.Client/@typeshim/wasm-exports/main.ts b/sample/@client/wasm-exports/main.ts
similarity index 100%
rename from sample/TypeShim.Sample.Client/@typeshim/wasm-exports/main.ts
rename to sample/@client/wasm-exports/main.ts
diff --git a/sample/TypeShim.Sample.Client/@typeshim/wasm-exports/package.json b/sample/@client/wasm-exports/package.json
similarity index 87%
rename from sample/TypeShim.Sample.Client/@typeshim/wasm-exports/package.json
rename to sample/@client/wasm-exports/package.json
index 58f5e216..5ec943a0 100644
--- a/sample/TypeShim.Sample.Client/@typeshim/wasm-exports/package.json
+++ b/sample/@client/wasm-exports/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@typeshim/wasm-exports",
+  "name": "@client/wasm-exports",
   "version": "1.0.0",
   "description": "",
   "main": "main.ts",
diff --git a/sample/TypeShim.Sample.Client/@typeshim/wasm-exports/wasm-bootstrap.ts b/sample/@client/wasm-exports/wasm-bootstrap.ts
similarity index 100%
rename from sample/TypeShim.Sample.Client/@typeshim/wasm-exports/wasm-bootstrap.ts
rename to sample/@client/wasm-exports/wasm-bootstrap.ts
diff --git a/sample/TypeShim.Sample/TypeShim.Sample.csproj b/sample/Client.Library/Client.Library.csproj
similarity index 94%
rename from sample/TypeShim.Sample/TypeShim.Sample.csproj
rename to sample/Client.Library/Client.Library.csproj
index da1469f7..43fda1a5 100644
--- a/sample/TypeShim.Sample/TypeShim.Sample.csproj
+++ b/sample/Client.Library/Client.Library.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <OutputPath>../TypeShim.Sample.Client/@typeshim/wasm-exports/lib</OutputPath>
+    <OutputPath>../@client/wasm-exports/lib</OutputPath>
     <!--<TypeShim_GeneratedDir>../../../TypeShim</TypeShim_GeneratedDir>-->
     <!--<TypeShim_TypeScriptOutputDirectory>wwwroot</TypeShim_TypeScriptOutputDirectory>-->
     <!--<TypeShim_MSBuildMessagePriority>High</TypeShim_MSBuildMessagePriority>-->
diff --git a/sample/TypeShim.Sample/Dtos.cs b/sample/Client.Library/Dtos.cs
similarity index 97%
rename from sample/TypeShim.Sample/Dtos.cs
rename to sample/Client.Library/Dtos.cs
index 8e26aa61..ad017837 100644
--- a/sample/TypeShim.Sample/Dtos.cs
+++ b/sample/Client.Library/Dtos.cs
@@ -1,4 +1,4 @@
-namespace TypeShim.Sample;
+namespace Client.Library;
 
 public class PeopleDto
 {
diff --git a/sample/TypeShim.Sample/Models.cs b/sample/Client.Library/Models.cs
similarity index 97%
rename from sample/TypeShim.Sample/Models.cs
rename to sample/Client.Library/Models.cs
index 20727467..f5ebc4a8 100644
--- a/sample/TypeShim.Sample/Models.cs
+++ b/sample/Client.Library/Models.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace TypeShim.Sample;
+namespace Client.Library;
 
 [TSExport]
 public class People()
diff --git a/sample/TypeShim.Sample/PeopleApiClient.cs b/sample/Client.Library/PeopleApiClient.cs
similarity index 97%
rename from sample/TypeShim.Sample/PeopleApiClient.cs
rename to sample/Client.Library/PeopleApiClient.cs
index a72893fe..1db6146f 100644
--- a/sample/TypeShim.Sample/PeopleApiClient.cs
+++ b/sample/Client.Library/PeopleApiClient.cs
@@ -6,7 +6,7 @@
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace TypeShim.Sample;
+namespace Client.Library;
 
 public class PeopleApiClient(HttpClient httpClient)
 {
diff --git a/sample/TypeShim.Sample/PeopleApp.cs b/sample/Client.Library/PeopleApp.cs
similarity index 97%
rename from sample/TypeShim.Sample/PeopleApp.cs
rename to sample/Client.Library/PeopleApp.cs
index aa2a8453..e50d12ae 100644
--- a/sample/TypeShim.Sample/PeopleApp.cs
+++ b/sample/Client.Library/PeopleApp.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Net.Http;
 
-namespace TypeShim.Sample;
+namespace Client.Library;
 
 [TSExport]
 public class PeopleAppOptions
diff --git a/sample/TypeShim.Sample/PeopleProvider.cs b/sample/Client.Library/PeopleProvider.cs
similarity index 97%
rename from sample/TypeShim.Sample/PeopleProvider.cs
rename to sample/Client.Library/PeopleProvider.cs
index 5815e07b..68fffbb5 100644
--- a/sample/TypeShim.Sample/PeopleProvider.cs
+++ b/sample/Client.Library/PeopleProvider.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using TypeShim;
 
-namespace TypeShim.Sample;
+namespace Client.Library;
 
 [TSExport]
 public class PeopleProvider
diff --git a/sample/TypeShim.Sample/Program.cs b/sample/Client.Library/Program.cs
similarity index 96%
rename from sample/TypeShim.Sample/Program.cs
rename to sample/Client.Library/Program.cs
index ace2184c..a0cb47e2 100644
--- a/sample/TypeShim.Sample/Program.cs
+++ b/sample/Client.Library/Program.cs
@@ -5,7 +5,7 @@
 using System.Net.Http;
 using System.Runtime.InteropServices.JavaScript;
 
-namespace TypeShim.Sample;
+namespace Client.Library;
 
 public partial class Program
 {
diff --git a/sample/TypeShim.Sample/Properties/AssemblyInfo.cs b/sample/Client.Library/Properties/AssemblyInfo.cs
similarity index 100%
rename from sample/TypeShim.Sample/Properties/AssemblyInfo.cs
rename to sample/Client.Library/Properties/AssemblyInfo.cs
diff --git a/sample/TypeShim.Sample/RandomEntityGenerator.cs b/sample/Client.Library/RandomEntityGenerator.cs
similarity index 98%
rename from sample/TypeShim.Sample/RandomEntityGenerator.cs
rename to sample/Client.Library/RandomEntityGenerator.cs
index 58b61bd0..5b603c20 100644
--- a/sample/TypeShim.Sample/RandomEntityGenerator.cs
+++ b/sample/Client.Library/RandomEntityGenerator.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace TypeShim.Sample;
+namespace Client.Library;
 
 public class RandomEntityGenerator
 {
diff --git a/sample/TypeShim.Sample/wwwroot/_framework/dotnet.d.ts b/sample/Client.Library/wwwroot/_framework/dotnet.d.ts
similarity index 100%
rename from sample/TypeShim.Sample/wwwroot/_framework/dotnet.d.ts
rename to sample/Client.Library/wwwroot/_framework/dotnet.d.ts
diff --git a/sample/Sample.slnx b/sample/Sample.slnx
index e2e31d22..37af4c25 100644
--- a/sample/Sample.slnx
+++ b/sample/Sample.slnx
@@ -1,9 +1,4 @@
 <Solution>
-  <Project Path="TypeShim.Sample.Server/TypeShim.Sample.Server.csproj" />
-  <Project Path="TypeShim.Sample/TypeShim.Sample.csproj" />
-  <Project Path="TypeShim.Sample.Client/TypeShim.Sample.Client.esproj">
-    <BuildDependency Project="TypeShim.Sample/TypeShim.Sample.csproj" />
-    <Build />
-    <Deploy />
-  </Project>
+  <Project Path="Server/Server.csproj" />
+  <Project Path="Client.Library/Client.Library.csproj" />
 </Solution>
diff --git a/sample/TypeShim.Sample.Server/Controllers/PeopleController.cs b/sample/Server/Controllers/PeopleController.cs
similarity index 85%
rename from sample/TypeShim.Sample.Server/Controllers/PeopleController.cs
rename to sample/Server/Controllers/PeopleController.cs
index 0ca34245..921d79de 100644
--- a/sample/TypeShim.Sample.Server/Controllers/PeopleController.cs
+++ b/sample/Server/Controllers/PeopleController.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
-using TypeShim.Sample;
+using Client.Library;
 
-namespace TypeShim.Sample.Server.Controllers;
+namespace Server.Controllers;
 
 [ApiController]
 [Route("[controller]")]
diff --git a/sample/TypeShim.Sample.Server/Program.cs b/sample/Server/Program.cs
similarity index 88%
rename from sample/TypeShim.Sample.Server/Program.cs
rename to sample/Server/Program.cs
index 038805c6..d92738cf 100644
--- a/sample/TypeShim.Sample.Server/Program.cs
+++ b/sample/Server/Program.cs
@@ -14,7 +14,7 @@
 #pragma warning restore ASP0014 // Suggest using top level route registrations
 app.UseSpa(spa =>
 {
-    // run 'npm start' or 'npm run dev' in TypeShim.Sample.Client to start the vite dev server
+    // run 'npm start' or 'npm run dev' in the sample directory to start the vite dev server
     spa.UseProxyToSpaDevelopmentServer("http://localhost:5173/");
 });
 
diff --git a/sample/TypeShim.Sample.Server/Properties/launchSettings.json b/sample/Server/Properties/launchSettings.json
similarity index 100%
rename from sample/TypeShim.Sample.Server/Properties/launchSettings.json
rename to sample/Server/Properties/launchSettings.json
diff --git a/sample/TypeShim.Sample.Server/TypeShim.Sample.Server.csproj b/sample/Server/Server.csproj
similarity index 86%
rename from sample/TypeShim.Sample.Server/TypeShim.Sample.Server.csproj
rename to sample/Server/Server.csproj
index ca0d9b18..040f075e 100644
--- a/sample/TypeShim.Sample.Server/TypeShim.Sample.Server.csproj
+++ b/sample/Server/Server.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\TypeShim.Sample\TypeShim.Sample.csproj" />
+    <ProjectReference Include="..\Client.Library\Client.Library.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/sample/TypeShim.Sample.Server/appsettings.Development.json b/sample/Server/appsettings.Development.json
similarity index 100%
rename from sample/TypeShim.Sample.Server/appsettings.Development.json
rename to sample/Server/appsettings.Development.json
diff --git a/sample/TypeShim.Sample.Server/appsettings.json b/sample/Server/appsettings.json
similarity index 100%
rename from sample/TypeShim.Sample.Server/appsettings.json
rename to sample/Server/appsettings.json
diff --git a/sample/TypeShim.Sample.Client/@typeshim/people-ui/package.json b/sample/TypeShim.Sample.Client/@typeshim/people-ui/package.json
deleted file mode 100644
index d37a2ec3..00000000
--- a/sample/TypeShim.Sample.Client/@typeshim/people-ui/package.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "name": "@typeshim/people-ui",
-  "version": "1.0.0",
-  "description": "",
-  "types": "src/index.ts",
-  "main": "src/index.ts",
-  "module": "src/index.ts",
-  "exports": {
-    ".": {
-      "import": "./src/index.ts",
-      "types": "./src/index.ts"
-    }
-  },
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "tsc -p tsconfig.json"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@typeshim/wasm-exports": "*"
-  },
-  "peerDependencies": {
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
-  }
-}
diff --git a/sample/TypeShim.Sample.Client/@typeshim/people-ui/tsconfig.json b/sample/TypeShim.Sample.Client/@typeshim/people-ui/tsconfig.json
deleted file mode 100644
index 1946885d..00000000
--- a/sample/TypeShim.Sample.Client/@typeshim/people-ui/tsconfig.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "compilerOptions": {
-    "declaration": true,
-    "allowJs": true,
-    "declarationDir": "dist",
-    "emitDeclarationOnly": false,
-    "outDir": "dist",
-    "rootDir": ".",
-    "target": "ES2020",
-    "module": "esnext",
-    "moduleResolution": "bundler",
-    "jsx": "react-jsx",
-    "strict": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true
-  },
-  "include": ["src"]
-  
-}
diff --git a/sample/TypeShim.Sample.Client/TypeShim.Sample.Client.esproj b/sample/TypeShim.Sample.Client/TypeShim.Sample.Client.esproj
deleted file mode 100644
index e20242bd..00000000
--- a/sample/TypeShim.Sample.Client/TypeShim.Sample.Client.esproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.VisualStudio.JavaScript.Sdk/1.0.4671869">
-  <PropertyGroup>
-    <BuildCommand>npm run build</BuildCommand>
-    <!--<BuildOutputFolder>../TypeShim.Sample/wwwroot</BuildOutputFolder>-->
-    <StartupCommand>npm start</StartupCommand>
-    <StartupCommandWorkingDirectory>$(MSBuildProjectDirectory)\</StartupCommandWorkingDirectory>
-  </PropertyGroup>
-  <ItemGroup>
-    <Folder Include="@typeshim" Exclude="*" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/sample/TypeShim.Sample.Client/TypeShim.Sample.Client.esproj.user b/sample/TypeShim.Sample.Client/TypeShim.Sample.Client.esproj.user
deleted file mode 100644
index 5791f9f0..00000000
--- a/sample/TypeShim.Sample.Client/TypeShim.Sample.Client.esproj.user
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <IsLinterEnabled>True</IsLinterEnabled>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/sample/TypeShim.Sample.Server/TypeShim.Sample.Server.csproj.user b/sample/TypeShim.Sample.Server/TypeShim.Sample.Server.csproj.user
deleted file mode 100644
index 9ff5820a..00000000
--- a/sample/TypeShim.Sample.Server/TypeShim.Sample.Server.csproj.user
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ActiveDebugProfile>https</ActiveDebugProfile>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/sample/TypeShim.Sample.Client/package-lock.json b/sample/package-lock.json
similarity index 98%
rename from sample/TypeShim.Sample.Client/package-lock.json
rename to sample/package-lock.json
index 6d85de1e..b3008b98 100644
--- a/sample/TypeShim.Sample.Client/package-lock.json
+++ b/sample/package-lock.json
@@ -1,15 +1,15 @@
 {
-  "name": "@typeshim/demo",
+  "name": "@client/demo",
   "version": "1.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "@typeshim/demo",
+      "name": "@client/demo",
       "version": "1.0.0",
       "license": "ISC",
       "workspaces": [
-        "@typeshim/*"
+        "@client/*"
       ],
       "dependencies": {
         "react": "^18.3.1",
@@ -25,36 +25,22 @@
         "vite-plugin-wasm": "^3.5.0"
       }
     },
-    "@typeshim/app": {
+    "@client/app": {
       "version": "1.0.0",
-      "license": "ISC",
-      "dependencies": {
-        "@typeshim/people-ui": "*"
-      }
+      "license": "ISC"
     },
-    "@typeshim/capabilities-ui": {
+    "@client/capabilities-ui": {
       "version": "1.0.0",
       "extraneous": true,
       "dependencies": {
-        "@typeshim/wasm-exports": "*"
+        "@client/wasm-exports": "*"
       },
       "peerDependencies": {
         "react": "^18.2.0",
         "react-dom": "^18.2.0"
       }
     },
-    "@typeshim/people-ui": {
-      "version": "1.0.0",
-      "license": "ISC",
-      "dependencies": {
-        "@typeshim/wasm-exports": "*"
-      },
-      "peerDependencies": {
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0"
-      }
-    },
-    "@typeshim/wasm-exports": {
+    "@client/wasm-exports": {
       "version": "1.0.0",
       "license": "ISC"
     },
@@ -1392,16 +1378,12 @@
         "@types/react": "^19.2.0"
       }
     },
-    "node_modules/@typeshim/app": {
-      "resolved": "@typeshim/app",
-      "link": true
-    },
-    "node_modules/@typeshim/people-ui": {
-      "resolved": "@typeshim/people-ui",
+    "node_modules/@client/app": {
+      "resolved": "@client/app",
       "link": true
     },
-    "node_modules/@typeshim/wasm-exports": {
-      "resolved": "@typeshim/wasm-exports",
+    "node_modules/@client/wasm-exports": {
+      "resolved": "@client/wasm-exports",
       "link": true
     },
     "node_modules/@vitejs/plugin-react": {
diff --git a/sample/TypeShim.Sample.Client/package.json b/sample/package.json
similarity index 58%
rename from sample/TypeShim.Sample.Client/package.json
rename to sample/package.json
index ff7b3ec9..be2dbb3f 100644
--- a/sample/TypeShim.Sample.Client/package.json
+++ b/sample/package.json
@@ -1,22 +1,21 @@
 {
-  "name": "@typeshim/demo",
+  "name": "@client/demo",
   "version": "1.0.0",
   "description": "",
   "scripts": {
-    "start": "npm run dev -w @typeshim/app",
-    "dev": "npm run dev -w @typeshim/app",
+    "start": "npm run dev -w @client/app",
+    "dev": "npm run dev -w @client/app",
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build:exports": "npm run build -w @typeshim/wasm-exports",
-    "build:people": "npm run build -w @typeshim/people-ui",
-    "build:app": "npm run build -w @typeshim/app",
-    "build": "npm run build:exports && npm run build:people && npm run build:app"
+    "build:exports": "npm run build -w @client/wasm-exports",
+    "build:app": "npm run build -w @client/app",
+    "build": "npm run build:exports && npm run build:app"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "private": "true",
   "workspaces": [
-    "@typeshim/*"
+    "@client/*"
   ],
   "dependencies": {
     "react": "^18.3.1",
diff --git a/sample/TypeShim.Sample.Client/tsconfig.json b/sample/tsconfig.json
similarity index 86%
rename from sample/TypeShim.Sample.Client/tsconfig.json
rename to sample/tsconfig.json
index e8db3099..f8a4b65a 100644
--- a/sample/TypeShim.Sample.Client/tsconfig.json
+++ b/sample/tsconfig.json
@@ -10,6 +10,5 @@
     "skipLibCheck": true
   },
   "references": [
-    { "path": "@typeshim/people-ui" }
   ]
 }