diff --git a/tests/Initialize.feature b/tests/Features/Initialize/Initialize.feature
similarity index 100%
rename from tests/Initialize.feature
rename to tests/Features/Initialize/Initialize.feature
diff --git a/tests/InitializeSteps.fs b/tests/Features/Initialize/InitializeSteps.fs
similarity index 100%
rename from tests/InitializeSteps.fs
rename to tests/Features/Initialize/InitializeSteps.fs
diff --git a/tests/Settings.feature b/tests/Features/Settings/Settings.feature
similarity index 100%
rename from tests/Settings.feature
rename to tests/Features/Settings/Settings.feature
diff --git a/tests/SettingsSteps.fs b/tests/Features/Settings/SettingsSteps.fs
similarity index 100%
rename from tests/SettingsSteps.fs
rename to tests/Features/Settings/SettingsSteps.fs
diff --git a/tests/Validation.feature b/tests/Features/Validation/Validation.feature
similarity index 100%
rename from tests/Validation.feature
rename to tests/Features/Validation/Validation.feature
diff --git a/tests/ValidationSteps.fs b/tests/Features/Validation/ValidationSteps.fs
similarity index 100%
rename from tests/ValidationSteps.fs
rename to tests/Features/Validation/ValidationSteps.fs
diff --git a/tests/Program.fs b/tests/Program.fs
index d17ca5f..97d1dae 100644
--- a/tests/Program.fs
+++ b/tests/Program.fs
@@ -16,7 +16,7 @@ let testListFromFeature (feature: TickSpec.Feature) : Expecto.Test =
     |> testSequenced
 
 let featureTest (resourceName: string) =
-    (assembly.GetName().Name + "." + resourceName)
+    (assembly.GetName().Name + ".Features." + resourceName.Replace(".feature", ".") + resourceName)
     |> featureFromEmbeddedResource
     |> testListFromFeature
 
diff --git a/tests/Skillaz.SecureChat.AcceptanceTests.fsproj b/tests/Skillaz.SecureChat.AcceptanceTests.fsproj
index 0e01f9e..88430fb 100644
--- a/tests/Skillaz.SecureChat.AcceptanceTests.fsproj
+++ b/tests/Skillaz.SecureChat.AcceptanceTests.fsproj
@@ -17,12 +17,12 @@
         <Compile Include="ArgsBuilder.fs" />
         <Compile Include="ModelBuilder.fs" />
         <Compile Include="SharedSteps.fs" />
-        <Compile Include="InitializeSteps.fs" />
-        <EmbeddedResource Include="Initialize.feature" />
-        <Compile Include="ValidationSteps.fs" />
-        <EmbeddedResource Include="Validation.feature" />
-        <Compile Include="SettingsSteps.fs" />
-        <EmbeddedResource Include="Settings.feature" />
+        <Compile Include="Features\Initialize\InitializeSteps.fs" />
+        <EmbeddedResource Include="Features\Initialize\Initialize.feature" />
+        <Compile Include="Features\Settings\SettingsSteps.fs" />
+        <EmbeddedResource Include="Features\Settings\Settings.feature" />
+        <Compile Include="Features\Validation\ValidationSteps.fs" />
+        <EmbeddedResource Include="Features\Validation\Validation.feature" />
         <Compile Include="Program.fs" />
     </ItemGroup>