diff --git a/OWC/FloatingOWC_W2W/Mooring/lines.txt b/OWC/FloatingOWC/Mooring/lines.txt
similarity index 100%
rename from OWC/FloatingOWC_W2W/Mooring/lines.txt
rename to OWC/FloatingOWC/Mooring/lines.txt
diff --git a/OWC/FloatingOWC_W2W/OWC_rigid.slx b/OWC/FloatingOWC/OWC_rigid.slx
similarity index 100%
rename from OWC/FloatingOWC_W2W/OWC_rigid.slx
rename to OWC/FloatingOWC/OWC_rigid.slx
diff --git a/OWC/FloatingOWC_W2W/README.md b/OWC/FloatingOWC/README.md
similarity index 100%
rename from OWC/FloatingOWC_W2W/README.md
rename to OWC/FloatingOWC/README.md
diff --git a/OWC/FloatingOWC_W2W/fitCurves.m b/OWC/FloatingOWC/fitCurves.m
similarity index 100%
rename from OWC/FloatingOWC_W2W/fitCurves.m
rename to OWC/FloatingOWC/fitCurves.m
diff --git a/OWC/FloatingOWC_W2W/fittingFunctions.m b/OWC/FloatingOWC/fittingFunctions.m
similarity index 100%
rename from OWC/FloatingOWC_W2W/fittingFunctions.m
rename to OWC/FloatingOWC/fittingFunctions.m
diff --git a/OWC/FloatingOWC_W2W/genPower.m b/OWC/FloatingOWC/genPower.m
similarity index 100%
rename from OWC/FloatingOWC_W2W/genPower.m
rename to OWC/FloatingOWC/genPower.m
diff --git a/OWC/FloatingOWC_W2W/geometry/Sparbuoy_Floater.stl b/OWC/FloatingOWC/geometry/Sparbuoy_Floater.stl
similarity index 100%
rename from OWC/FloatingOWC_W2W/geometry/Sparbuoy_Floater.stl
rename to OWC/FloatingOWC/geometry/Sparbuoy_Floater.stl
diff --git a/OWC/FloatingOWC_W2W/geometry/Sparbuoy_OWC.stl b/OWC/FloatingOWC/geometry/Sparbuoy_OWC.stl
similarity index 100%
rename from OWC/FloatingOWC_W2W/geometry/Sparbuoy_OWC.stl
rename to OWC/FloatingOWC/geometry/Sparbuoy_OWC.stl
diff --git a/OWC/FloatingOWC_W2W/hydroData/bemio.m b/OWC/FloatingOWC/hydroData/bemio.m
similarity index 100%
rename from OWC/FloatingOWC_W2W/hydroData/bemio.m
rename to OWC/FloatingOWC/hydroData/bemio.m
diff --git a/OWC/FloatingOWC_W2W/hydroData/floatingOWC.AH1 b/OWC/FloatingOWC/hydroData/floatingOWC.AH1
similarity index 100%
rename from OWC/FloatingOWC_W2W/hydroData/floatingOWC.AH1
rename to OWC/FloatingOWC/hydroData/floatingOWC.AH1
diff --git a/OWC/FloatingOWC_W2W/hydroData/floatingOWC.LIS b/OWC/FloatingOWC/hydroData/floatingOWC.LIS
similarity index 100%
rename from OWC/FloatingOWC_W2W/hydroData/floatingOWC.LIS
rename to OWC/FloatingOWC/hydroData/floatingOWC.LIS
diff --git a/OWC/FloatingOWC_W2W/userDefinedFunctions.m b/OWC/FloatingOWC/userDefinedFunctions.m
similarity index 100%
rename from OWC/FloatingOWC_W2W/userDefinedFunctions.m
rename to OWC/FloatingOWC/userDefinedFunctions.m
diff --git a/OWC/FloatingOWC_W2W/wecSimInputFile.m b/OWC/FloatingOWC/wecSimInputFile.m
similarity index 99%
rename from OWC/FloatingOWC_W2W/wecSimInputFile.m
rename to OWC/FloatingOWC/wecSimInputFile.m
index 9ab0d248..48f5f1bd 100644
--- a/OWC/FloatingOWC_W2W/wecSimInputFile.m
+++ b/OWC/FloatingOWC/wecSimInputFile.m
@@ -132,7 +132,4 @@
 Izz = 0.5* waterColumnMass * (airChamber(1).owcDiameter/2)^2; 
 Ixx = waterColumnMass * (3 * (airChamber(1).owcDiameter/2)^2 + waterColumnHeight^2) /12;
 
-body(2).inertia =  [Ixx    Ixx   Izz];
-
-
-
+body(2).inertia =  [Ixx    Ixx   Izz];
\ No newline at end of file
diff --git a/OWC/OrificeModel/TestOWC.m b/OWC/TestOWC.m
similarity index 65%
rename from OWC/OrificeModel/TestOWC.m
rename to OWC/TestOWC.m
index fd6183c5..918406d6 100644
--- a/OWC/OrificeModel/TestOWC.m
+++ b/OWC/TestOWC.m
@@ -1,24 +1,23 @@
 classdef TestOWC < matlab.unittest.TestCase
-    
+
     properties
         OriginalDefault
         testDir
-        h5DirOrifice = 'hydroData'
+        h5DirOrifice = ['OrificeModel',filesep,'hydroData']
         h5NameOrifice = 'test17a.h5'
+        h5DirFloating = ['FloatingOWC',filesep,'hydroData']
+        h5NameFloating = 'floatingOWC.h5'
     end
-    
     methods (Access = 'public')
         function obj = TestOWC
             obj.testDir = fileparts(mfilename('fullpath'));
         end
     end
-    
     methods (TestMethodSetup)
         function killPlots (~)
             set(0,'DefaultFigureVisible','off');
         end
     end
-    
     methods(TestClassSetup)
         function captureVisibility(testCase)
             testCase.OriginalDefault = get(0,'DefaultFigureVisible');
@@ -32,14 +31,21 @@ function runBemioOrifice(testCase)
             end
             cd(testCase.testDir)
         end
+        function runBemioFloating(testCase)
+            cd(testCase.h5DirFloating);
+            if isfile(testCase.h5NameFloating)
+                fprintf('runBemio skipped, *.h5 already exists\n')
+            else
+                bemio
+            end
+            cd(testCase.testDir)
+        end
     end
-    
     methods(TestMethodTeardown)
         function returnHome(testCase)
             cd(testCase.testDir)
         end
     end
-    
     methods(TestClassTeardown)
         function checkVisibilityRestored(testCase)
             set(0,'DefaultFigureVisible',testCase.OriginalDefault);
@@ -47,9 +53,17 @@ function checkVisibilityRestored(testCase)
                 testCase.OriginalDefault);
         end
     end
-    
+
     methods(Test)
         function testOWCOrifice(testCase)
+            cd('OrificeModel')
+            wecSim
+        end
+
+        function testOWCFloating(testCase)
+            assumeEqual(testCase, exist("MoorDyn_caller", "file"), 2, ...
+                "MoorDyn is not installed");
+            cd('FloatingOWC')
             wecSim
         end
     end