diff --git a/.gitmodules b/.gitmodules
index 807622e..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "xunit.runner.wpf"]
-	path = xunit.runner.wpf
-	url = git@github.com:Speckle-Next/xunit.runner.wpf.git
diff --git a/xUnitRevit.sln b/xUnitRevit.sln
index 33bdb2f..8437b05 100644
--- a/xUnitRevit.sln
+++ b/xUnitRevit.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.30011.22
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xUnitRevit", "xUnitRevit\xUnitRevit.csproj", "{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xunit.runner.wpf", "xunit.runner.wpf\xunit.runner.wpf\xunit.runner.wpf.csproj", "{4120F4AC-1B24-4B7C-86A9-0A3C75E526CD}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xUnitRevitUtils", "xUnitRevitUtils\xUnitRevitUtils.csproj", "{06EAEFF6-4704-40B4-B42A-D8A46EEDD6F0}"
 EndProject
 Global
@@ -19,10 +17,6 @@ Global
 		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4120F4AC-1B24-4B7C-86A9-0A3C75E526CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4120F4AC-1B24-4B7C-86A9-0A3C75E526CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4120F4AC-1B24-4B7C-86A9-0A3C75E526CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4120F4AC-1B24-4B7C-86A9-0A3C75E526CD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{06EAEFF6-4704-40B4-B42A-D8A46EEDD6F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{06EAEFF6-4704-40B4-B42A-D8A46EEDD6F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{06EAEFF6-4704-40B4-B42A-D8A46EEDD6F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/xUnitRevit/Command.cs b/xUnitRevit/Command.cs
index 643a109..784454e 100644
--- a/xUnitRevit/Command.cs
+++ b/xUnitRevit/Command.cs
@@ -1,17 +1,10 @@
 #region Namespaces
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Reflection;
 using System.Threading;
-using Autodesk.Revit.ApplicationServices;
 using Autodesk.Revit.Attributes;
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
-using Autodesk.Revit.UI.Selection;
-using Xunit.Runner.Wpf;
-using Xunit.Runner.Wpf.ViewModel;
 #endregion
 
 namespace xUnitRevit
@@ -31,15 +24,7 @@ namespace xUnitRevit
       UIApplication uiapp = commandData.Application;
       Runner.Launch(uiapp);
       return Result.Succeeded;
-
-
-
     }
-
-
-
-
-
   }
 
 
diff --git a/xUnitRevit/ExternalEventHandler.cs b/xUnitRevit/ExternalEventHandler.cs
index 3f5688d..07de43d 100644
--- a/xUnitRevit/ExternalEventHandler.cs
+++ b/xUnitRevit/ExternalEventHandler.cs
@@ -9,8 +9,8 @@ using System.Threading.Tasks;
 namespace xUnitRevit
 {
   /// <summary>
-  /// Speckle custom event invoker. Has a queue of actions that, in theory, this things should iterate through. 
-  /// Actions are added to the queue from the ui bindings (mostly) and then raised. 
+  /// Event invoker. Has a queue of actions that, in theory, this thing should iterate through. 
+  /// Required to run transactions form a non modal window.
   /// </summary>
   public class ExternalEventHandler : IExternalEventHandler
   {
@@ -32,7 +32,6 @@ namespace xUnitRevit
 
       Queue[0]();
 
-
       Queue.RemoveAt(0);
       Running = false;
     }
diff --git a/xUnitRevit/Properties/AssemblyInfo.cs b/xUnitRevit/Properties/AssemblyInfo.cs
index 830c8cb..7a07311 100644
--- a/xUnitRevit/Properties/AssemblyInfo.cs
+++ b/xUnitRevit/Properties/AssemblyInfo.cs
@@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("SpeckleRevitTests")]
-[assembly: AssemblyDescription("Revit Add-In Description for SpeckleRevitTests")]
+[assembly: AssemblyTitle("xUnitRevit")]
+[assembly: AssemblyDescription("xUnit runner for Revit")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Autodesk Inc.")]
-[assembly: AssemblyProduct("SpeckleRevitTests Revit C# .NET Add-In")]
-[assembly: AssemblyCopyright("Copyright (C) 2020 by Jeremy Tammik, Autodesk Inc.")]
+[assembly: AssemblyCompany("Speckle")]
+[assembly: AssemblyProduct("xUnitRevit")]
+[assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2021.0.0.0")]
-[assembly: AssemblyFileVersion("2021.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/xUnitRevit/Runner.cs b/xUnitRevit/Runner.cs
index 1aeea16..61dc9ba 100644
--- a/xUnitRevit/Runner.cs
+++ b/xUnitRevit/Runner.cs
@@ -14,6 +14,9 @@ using System.IO;
 
 namespace xUnitRevit
 {
+  /// <summary>
+  /// Responsible for launching the xUnit WPF interface and initializing xru with Revit data
+  /// </summary>
   public static class Runner
   {
     internal static Configuration Config = new Configuration();
diff --git a/xUnitRevit/packages.config b/xUnitRevit/packages.config
new file mode 100644
index 0000000..d10c0ce
--- /dev/null
+++ b/xUnitRevit/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="speckle.xunit.runner.wpf" version="1.0.1" targetFramework="net48" />
+</packages>
\ No newline at end of file
diff --git a/xUnitRevit/xUnitRevit.csproj b/xUnitRevit/xUnitRevit.csproj
index 27848e8..7a55f91 100644
--- a/xUnitRevit/xUnitRevit.csproj
+++ b/xUnitRevit/xUnitRevit.csproj
@@ -54,6 +54,9 @@
       <HintPath>$(ProgramW6432)\Autodesk\Revit 2021\RevitAPIUI.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="speckle.xunit.runner.wpf, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\speckle.xunit.runner.wpf.1.0.1\lib\net48\speckle.xunit.runner.wpf.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="WindowsBase" />
@@ -72,13 +75,10 @@
     <None Include="config.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="packages.config" />
     <None Include="xUnitRevit.addin" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\xunit.runner.wpf\xunit.runner.wpf\xunit.runner.wpf.csproj">
-      <Project>{4120f4ac-1b24-4b7c-86a9-0a3c75e526cd}</Project>
-      <Name>xunit.runner.wpf</Name>
-    </ProjectReference>
     <ProjectReference Include="..\xUnitRevitUtils\xUnitRevitUtils.csproj">
       <Project>{06eaeff6-4704-40b4-b42a-d8a46eedd6f0}</Project>
       <Name>xUnitRevitUtils</Name>
diff --git a/xUnitRevitUtils/xUnitRevitUtils.csproj b/xUnitRevitUtils/xUnitRevitUtils.csproj
index fe19c8d..2629154 100644
--- a/xUnitRevitUtils/xUnitRevitUtils.csproj
+++ b/xUnitRevitUtils/xUnitRevitUtils.csproj
@@ -1,7 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageProjectUrl>https://github.com/Speckle-Next/xunit-Revit</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/Speckle-Next/xunit-Revit</RepositoryUrl>
+    <PackageTags>xunit revit runner</PackageTags>
+    <Authors>Speckle</Authors>
+    <Company>Speckle</Company>
+    <Description>xUnit runner for Revit</Description>
+    <PackageIconUrl>https://avatars2.githubusercontent.com/u/2092016</PackageIconUrl>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/xunit.runner.wpf b/xunit.runner.wpf
deleted file mode 160000
index 8041093..0000000
--- a/xunit.runner.wpf
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8041093761a2d7e3ecb052d4edee18ce8bac055b