diff --git a/weehawken/BrowserDriver.cs b/weehawken/Harness/BrowserDriver.cs
similarity index 92%
rename from weehawken/BrowserDriver.cs
rename to weehawken/Harness/BrowserDriver.cs
index 2f6523f..3216318 100644
--- a/weehawken/BrowserDriver.cs
+++ b/weehawken/Harness/BrowserDriver.cs
@@ -18,9 +18,9 @@ namespace weehawken
                 case "firefox":
                     return GetFirefox(headless);
                 case "safari":
-                    return getSafari(headless);
+                    return getSafari(false); //headless not supported
                 case "edge":
-                    return getEdge(headless);
+                    return getEdge(headless); //headless only available in Selenium 4
                 default:
                     throw new ArgumentException("Invalid browser specified"); 
             }
diff --git a/weehawken/BrowserTests.cs b/weehawken/Tests/BrowserTests.cs
similarity index 98%
rename from weehawken/BrowserTests.cs
rename to weehawken/Tests/BrowserTests.cs
index 0583e3c..9dd12bb 100644
--- a/weehawken/BrowserTests.cs
+++ b/weehawken/Tests/BrowserTests.cs
@@ -5,7 +5,7 @@ using OpenQA.Selenium.Remote;
 
 namespace weehawken
 {
-    public class Tests
+    public class BrowserTests
     {
         private String url;
         private RemoteWebDriver driver;
diff --git a/weehawken/weehawken.csproj b/weehawken/weehawken.csproj
index 1034bc0..843d3e2 100644
--- a/weehawken/weehawken.csproj
+++ b/weehawken/weehawken.csproj
@@ -7,8 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="Selenium.WebDriver" Version="4.0.0-alpha05" />
     <PackageReference Include="Selenium.Support" Version="4.0.0-alpha05" />
@@ -17,11 +15,9 @@
     <PackageReference Include="Selenium.WebDriver.GeckoDriver" Version="0.27.0" />
     <PackageReference Include="Selenium.WebDriver.Extensions" Version="3.3.0" />
     <PackageReference Include="Selenium.WebDriver.MSEdgeDriver" Version="85.0.564.41" />
-    <PackageReference Include="SpecFlow" Version="3.4.14" />
-    <PackageReference Include="SpecFlow.NUnit" Version="3.4.14" />
-    <PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.4.14" />
-    <PackageReference Include="gherkin" Version="6.0.0" />
-    <PackageReference Include="SpecFlow.CustomPlugin" Version="3.4.14" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="BoDi" Version="1.4.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -29,4 +25,8 @@
       <Visible>False</Visible>
     </SpecFlowFeatureFiles>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Harness\" />
+    <Folder Include="Tests\" />
+  </ItemGroup>
 </Project>