Streamlined the Scanners namespace

Michael Whelan · Michael Whelan · commit fc449e20c0b9 · 2014-03-13T16:12:50.000Z
diff --git a/Samples/TestStack.BDDfy.Samples/Atm/AccountHasInsufficientFund.cs b/Samples/TestStack.BDDfy.Samples/Atm/AccountHasInsufficientFund.cs
@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Samples.Atm
 {
diff --git a/Samples/TestStack.BDDfy.Samples/Atm/AccountHolderWithdrawsCash.cs b/Samples/TestStack.BDDfy.Samples/Atm/AccountHolderWithdrawsCash.cs
@@ -1,6 +1,6 @@
 using NUnit.Framework;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.StepScanners.Fluent;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Samples.Atm
 {
diff --git a/Samples/TestStack.BDDfy.Samples/BDDfy_Rocks.cs b/Samples/TestStack.BDDfy.Samples/BDDfy_Rocks.cs
@@ -1,6 +1,6 @@
 ﻿using NUnit.Framework;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.StepScanners.Fluent;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Samples
 {
diff --git a/Samples/TestStack.BDDfy.Samples/TicTacToe/TicTacToe.cs b/Samples/TestStack.BDDfy.Samples/TicTacToe/TicTacToe.cs
@@ -1,6 +1,6 @@
 using NUnit.Framework;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.StepScanners.Fluent;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Samples.TicTacToe
 {
diff --git a/TestStack.BDDfy.Tests/Configuration/TestRunnerTests.cs b/TestStack.BDDfy.Tests/Configuration/TestRunnerTests.cs
@@ -3,8 +3,7 @@
 using NUnit.Framework;
 using TestStack.BDDfy.Configuration;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes;
-using TestStack.BDDfy.Scanners.StepScanners.Fluent;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Tests.Configuration
 {
diff --git a/TestStack.BDDfy.Tests/Exceptions/ExceptionThrowingTest.cs b/TestStack.BDDfy.Tests/Exceptions/ExceptionThrowingTest.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using NUnit.Framework;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.StepScanners.Fluent;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Tests.Exceptions
 {
diff --git a/TestStack.BDDfy.Tests/FluentScanner/BDDfyUsingFluentApi.cs b/TestStack.BDDfy.Tests/FluentScanner/BDDfyUsingFluentApi.cs
@@ -5,7 +5,7 @@
 using System.Linq;
 using TestStack.BDDfy.Configuration;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.StepScanners.Fluent;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Tests.FluentScanner
 {
diff --git a/TestStack.BDDfy.Tests/FluentScanner/ScenarioToBeScannedUsingFluentScanner.cs b/TestStack.BDDfy.Tests/FluentScanner/ScenarioToBeScannedUsingFluentScanner.cs
@@ -3,8 +3,7 @@
 using System.Linq;
 using System.Collections.Generic;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes;
-using TestStack.BDDfy.Scanners.StepScanners.Fluent;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Tests.FluentScanner
 {
diff --git a/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReportBuilderSpecs.cs b/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReportBuilderSpecs.cs
@@ -2,7 +2,7 @@
 using System.Text.RegularExpressions;
 using NUnit.Framework;
 using TestStack.BDDfy.Processors;
-using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Tests.Processors.Reports.MarkDown
 {
diff --git a/TestStack.BDDfy.Tests/Scanner/ExecutableAttributeOrderOrdersTheStepsCorrectly.cs b/TestStack.BDDfy.Tests/Scanner/ExecutableAttributeOrderOrdersTheStepsCorrectly.cs
@@ -3,8 +3,7 @@
 using NUnit.Framework;
 using TestStack.BDDfy.Configuration;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.ScenarioScanners;
-using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Tests.Scanner
 {
diff --git a/TestStack.BDDfy.Tests/Scanner/ExpressionExtensionsTests.cs b/TestStack.BDDfy.Tests/Scanner/ExpressionExtensionsTests.cs
@@ -2,7 +2,7 @@
 using System.Linq.Expressions;
 using NUnit.Framework;
 using System.Linq;
-using TestStack.BDDfy.Scanners.StepScanners.Fluent;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Tests.Scanner
 {
diff --git a/TestStack.BDDfy.Tests/Scanner/StepScannerExtensions.cs b/TestStack.BDDfy.Tests/Scanner/StepScannerExtensions.cs
@@ -1,8 +1,7 @@
 ﻿using System.Collections.Generic;
 using System.Linq;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.ScenarioScanners;
-using TestStack.BDDfy.Scanners.StepScanners;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Tests.Scanner
 {
diff --git a/TestStack.BDDfy.Tests/Scanner/StepText/DefaultScanForStepsByMethodNameTests.cs b/TestStack.BDDfy.Tests/Scanner/StepText/DefaultScanForStepsByMethodNameTests.cs
@@ -1,7 +1,7 @@
 using NUnit.Framework;
 using System.Linq;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.StepScanners.MethodName;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Tests.Scanner.StepText
 {
diff --git a/TestStack.BDDfy.Tests/Scanner/StepText/ExecutableAttributeScannerTests.cs b/TestStack.BDDfy.Tests/Scanner/StepText/ExecutableAttributeScannerTests.cs
@@ -1,8 +1,7 @@
 using System.Linq;
 using NUnit.Framework;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute;
-using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Tests.Scanner.StepText
 {
diff --git a/TestStack.BDDfy.Tests/Scanner/WhenCombinationOfExecutableAttributeAndMethodNamingConventionIsUsed.cs b/TestStack.BDDfy.Tests/Scanner/WhenCombinationOfExecutableAttributeAndMethodNamingConventionIsUsed.cs
@@ -3,11 +3,7 @@
 using System.Linq;
 using TestStack.BDDfy.Configuration;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.ScenarioScanners;
-using TestStack.BDDfy.Scanners.StepScanners;
-using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute;
-using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes;
-using TestStack.BDDfy.Scanners.StepScanners.MethodName;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Tests.Scanner
 {
diff --git a/TestStack.BDDfy.Tests/Scanner/WhenMethodNamesFollowNamingConventionsOtherThanGivenWhenThen.cs b/TestStack.BDDfy.Tests/Scanner/WhenMethodNamesFollowNamingConventionsOtherThanGivenWhenThen.cs
@@ -4,8 +4,7 @@
 using System.Linq;
 using TestStack.BDDfy.Configuration;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.StepScanners;
-using TestStack.BDDfy.Scanners.StepScanners.MethodName;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Tests.Scanner
 {
diff --git a/TestStack.BDDfy.Tests/Scanner/WhenStepScannerFactoryAsyncMethods.cs b/TestStack.BDDfy.Tests/Scanner/WhenStepScannerFactoryAsyncMethods.cs
@@ -3,7 +3,7 @@
 using System.Reflection;
 using System.Threading.Tasks;
 using NUnit.Framework;
-using TestStack.BDDfy.Scanners.StepScanners;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Tests.Scanner
 {
diff --git a/TestStack.BDDfy.Tests/Scanner/WhenStepsReturnTheirText.cs b/TestStack.BDDfy.Tests/Scanner/WhenStepsReturnTheirText.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using NUnit.Framework;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.StepScanners.MethodName;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Tests.Scanner
 {
diff --git a/TestStack.BDDfy.Tests/Scanner/WhenTestClassFollowsGivenWhenThenNamingConvention.cs b/TestStack.BDDfy.Tests/Scanner/WhenTestClassFollowsGivenWhenThenNamingConvention.cs
@@ -2,7 +2,7 @@
 using NUnit.Framework;
 using System.Linq;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.StepScanners.MethodName;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Tests.Scanner
 {
diff --git a/TestStack.BDDfy.Tests/Scanner/WhenTestClassUsesExecutableAttributes.cs b/TestStack.BDDfy.Tests/Scanner/WhenTestClassUsesExecutableAttributes.cs
@@ -4,8 +4,7 @@
 using NUnit.Framework;
 using TestStack.BDDfy.Configuration;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute;
-using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Tests.Scanner
 {
diff --git a/TestStack.BDDfy.Tests/Story/StoryCanBeSpecifiedInFluentMode.cs b/TestStack.BDDfy.Tests/Story/StoryCanBeSpecifiedInFluentMode.cs
@@ -1,6 +1,6 @@
 ﻿using NUnit.Framework;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.StepScanners.Fluent;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Tests.Story
 {
diff --git a/TestStack.BDDfy.Tests/Story/StoryClassAndScenarioClassAreTheSame.cs b/TestStack.BDDfy.Tests/Story/StoryClassAndScenarioClassAreTheSame.cs
@@ -1,7 +1,7 @@
 using NUnit.Framework;
 using System.Linq;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Tests.Story
 {
diff --git a/TestStack.BDDfy.Tests/Story/StoryDouble.cs b/TestStack.BDDfy.Tests/Story/StoryDouble.cs
@@ -2,8 +2,6 @@
 using System.Linq;
 using TestStack.BDDfy.Core;
 using TestStack.BDDfy.Scanners;
-using TestStack.BDDfy.Scanners.ScenarioScanners;
-using TestStack.BDDfy.Scanners.StepScanners.MethodName;
 
 namespace TestStack.BDDfy.Tests.Story
 {
diff --git a/TestStack.BDDfy/BDDfyExtensions.cs b/TestStack.BDDfy/BDDfyExtensions.cs
@@ -3,7 +3,6 @@
 using TestStack.BDDfy.Configuration;
 using TestStack.BDDfy.Core;
 using TestStack.BDDfy.Scanners;
-using TestStack.BDDfy.Scanners.ScenarioScanners;
 
 namespace TestStack.BDDfy
 {
diff --git a/TestStack.BDDfy/Configuration/Scanners.cs b/TestStack.BDDfy/Configuration/Scanners.cs
@@ -2,9 +2,6 @@
 using System.Collections.Generic;
 using TestStack.BDDfy.Core;
 using TestStack.BDDfy.Scanners;
-using TestStack.BDDfy.Scanners.StepScanners;
-using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute;
-using TestStack.BDDfy.Scanners.StepScanners.MethodName;
 
 namespace TestStack.BDDfy.Configuration
 {
diff --git a/TestStack.BDDfy/Configuration/StepScannerFactory.cs b/TestStack.BDDfy/Configuration/StepScannerFactory.cs
@@ -1,5 +1,5 @@
 using System;
-using TestStack.BDDfy.Scanners.StepScanners;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Configuration
 {
diff --git a/TestStack.BDDfy/Scanners/DefaultScanner.cs b/TestStack.BDDfy/Scanners/DefaultScanner.cs
@@ -1,7 +1,6 @@
 using System;
 using TestStack.BDDfy.Configuration;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.ScenarioScanners;
 
 namespace TestStack.BDDfy.Scanners
 {
diff --git a/TestStack.BDDfy/Scanners/ScenarioScanners/FluentScenarioScanner.cs b/TestStack.BDDfy/Scanners/ScenarioScanners/FluentScenarioScanner.cs
@@ -3,7 +3,7 @@
 using System.Diagnostics;
 using TestStack.BDDfy.Core;
 
-namespace TestStack.BDDfy.Scanners.ScenarioScanners
+namespace TestStack.BDDfy.Scanners
 {
     public class FluentScenarioScanner : IScenarioScanner
     {
diff --git a/TestStack.BDDfy/Scanners/ScenarioScanners/IScenarioScanner.cs b/TestStack.BDDfy/Scanners/ScenarioScanners/IScenarioScanner.cs
@@ -1,6 +1,6 @@
 using TestStack.BDDfy.Core;
 
-namespace TestStack.BDDfy.Scanners.ScenarioScanners
+namespace TestStack.BDDfy.Scanners
 {
     public interface IScenarioScanner
     {
diff --git a/TestStack.BDDfy/Scanners/ScenarioScanners/ReflectiveScenarioScanner.cs b/TestStack.BDDfy/Scanners/ScenarioScanners/ReflectiveScenarioScanner.cs
@@ -3,9 +3,8 @@
 using System.Linq;
 using System.Reflection;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.StepScanners;
 
-namespace TestStack.BDDfy.Scanners.ScenarioScanners
+namespace TestStack.BDDfy.Scanners
 {
     public class ReflectiveScenarioScanner : IScenarioScanner
     {
diff --git a/TestStack.BDDfy/Scanners/StepScanners/AsyncTestSyncContext.cs b/TestStack.BDDfy/Scanners/StepScanners/AsyncTestSyncContext.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.Threading;
 
-namespace TestStack.BDDfy.Scanners.StepScanners
+namespace TestStack.BDDfy.Scanners
 {
     /// <summary>
     /// Implementation from xUnit 2.0
diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttribute.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using TestStack.BDDfy.Core;
 
-namespace TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute
+namespace TestStack.BDDfy.Scanners
 {
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
     public class ExecutableAttribute : Attribute
diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttributeStepScanner.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttributeStepScanner.cs
@@ -3,7 +3,7 @@
 using System.Reflection;
 using TestStack.BDDfy.Core;
 
-namespace TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute
+namespace TestStack.BDDfy.Scanners
 {
     /// <summary>
     /// Uses reflection to scan scenario class for steps by looking for
diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndGivenAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndGivenAttribute.cs
@@ -1,4 +1,4 @@
-﻿namespace TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes
+﻿namespace TestStack.BDDfy.Scanners
 {
     public class AndGivenAttribute : ExecutableAttribute
     {
diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndThenAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndThenAttribute.cs
@@ -1,4 +1,4 @@
-namespace TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes
+namespace TestStack.BDDfy.Scanners
 {
     public class AndThenAttribute : ExecutableAttribute
     {
diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndWhenAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndWhenAttribute.cs
@@ -1,4 +1,4 @@
-﻿namespace TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes
+﻿namespace TestStack.BDDfy.Scanners
 {
     public class AndWhenAttribute : ExecutableAttribute
     {
diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/GivenAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/GivenAttribute.cs
@@ -1,4 +1,4 @@
-﻿namespace TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes
+﻿namespace TestStack.BDDfy.Scanners
 {
     public class GivenAttribute : ExecutableAttribute
     {
diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/ThenAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/ThenAttribute.cs
@@ -1,4 +1,4 @@
-﻿namespace TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes
+﻿namespace TestStack.BDDfy.Scanners
 {
     public class ThenAttribute : ExecutableAttribute
     {
diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/WhenAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/WhenAttribute.cs
@@ -1,4 +1,4 @@
-﻿namespace TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes
+﻿namespace TestStack.BDDfy.Scanners
 {
     public class WhenAttribute : ExecutableAttribute
     {
diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/ExpressionExtensions.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/ExpressionExtensions.cs
@@ -5,7 +5,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 
-namespace TestStack.BDDfy.Scanners.StepScanners.Fluent
+namespace TestStack.BDDfy.Scanners
 {
     public static class ExpressionExtensions
     {
diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScanner.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScanner.cs
@@ -4,13 +4,12 @@
 using System.Reflection;
 using System.Linq;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Scanners.ScenarioScanners;
 
 #if !NET35
 using System.Threading.Tasks;
 #endif
 
-namespace TestStack.BDDfy.Scanners.StepScanners.Fluent
+namespace TestStack.BDDfy.Scanners
 {
     /// <summary>
     /// Provides an alternative method of implementing stories and scenarios.
diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScannerExtensions.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScannerExtensions.cs
@@ -3,7 +3,7 @@
 
 // ReSharper disable CheckNamespace
 // This is in BDDfy namespace to make its usage simpler
-namespace TestStack.BDDfy.Scanners.StepScanners.Fluent
+namespace TestStack.BDDfy.Scanners
 // ReSharper restore CheckNamespace
 {
     public static class FluentStepScannerExtensions
diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndGiven.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndGiven.cs
@@ -1,4 +1,4 @@
-﻿namespace TestStack.BDDfy.Scanners.StepScanners.Fluent
+﻿namespace TestStack.BDDfy.Scanners
 {
     public interface IAndGiven<TScenario> : IGiven<TScenario>
     {
diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndThen.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndThen.cs
@@ -1,4 +1,4 @@
-﻿namespace TestStack.BDDfy.Scanners.StepScanners.Fluent
+﻿namespace TestStack.BDDfy.Scanners
 {
     public interface IAndThen<TScenario> : IThen<TScenario>
     {
diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndWhen.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndWhen.cs
@@ -1,4 +1,4 @@
-﻿namespace TestStack.BDDfy.Scanners.StepScanners.Fluent
+﻿namespace TestStack.BDDfy.Scanners
 {
     public interface IAndWhen<TScenario> : IWhen<TScenario>
     {
diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IFluentScanner.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IFluentScanner.cs
@@ -2,7 +2,7 @@
 using System.Linq.Expressions;
 using TestStack.BDDfy.Core;
 
-namespace TestStack.BDDfy.Scanners.StepScanners.Fluent
+namespace TestStack.BDDfy.Scanners
 {
     public interface IFluentScanner<TScenario> : IHasScanner
     {
diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IGiven.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IGiven.cs
diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IInitialStep.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IInitialStep.cs
diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IThen.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IThen.cs
diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IWhen.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IWhen.cs
diff --git a/TestStack.BDDfy/Scanners/StepScanners/IStepScanner.cs b/TestStack.BDDfy/Scanners/StepScanners/IStepScanner.cs
diff --git a/TestStack.BDDfy/Scanners/StepScanners/IgnoreStepAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/IgnoreStepAttribute.cs
diff --git a/TestStack.BDDfy/Scanners/StepScanners/MethodName/DefaultMethodNameStepScanner.cs b/TestStack.BDDfy/Scanners/StepScanners/MethodName/DefaultMethodNameStepScanner.cs
diff --git a/TestStack.BDDfy/Scanners/StepScanners/MethodName/MethodNameMatcher.cs b/TestStack.BDDfy/Scanners/StepScanners/MethodName/MethodNameMatcher.cs
diff --git a/TestStack.BDDfy/Scanners/StepScanners/MethodName/MethodNameStepScanner.cs b/TestStack.BDDfy/Scanners/StepScanners/MethodName/MethodNameStepScanner.cs
diff --git a/TestStack.BDDfy/Scanners/StepScanners/StepActionFactory.cs b/TestStack.BDDfy/Scanners/StepScanners/StepActionFactory.cs
diff --git a/TestStack.BDDfy/Scanners/StepScanners/StepScannerExtensions.cs b/TestStack.BDDfy/Scanners/StepScanners/StepScannerExtensions.cs
diff --git a/TestStack.BDDfy/Scanners/StepScanners/StepTitleException.cs b/TestStack.BDDfy/Scanners/StepScanners/StepTitleException.cs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`using NUnit.Framework;`
`2`		`-using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes;`
	`2`	`+using TestStack.BDDfy.Scanners;`
`3`	`3`
`4`	`4`	`namespace TestStack.BDDfy.Samples.Atm`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using NUnit.Framework;`
`2`	`2`	`using TestStack.BDDfy.Core;`
`3`		`-using TestStack.BDDfy.Scanners.StepScanners.Fluent;`
	`3`	`+using TestStack.BDDfy.Scanners;`
`4`	`4`
`5`	`5`	`namespace TestStack.BDDfy.Samples.Atm`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,7 @@`
`3`	`3`	`using NUnit.Framework;`
`4`	`4`	`using TestStack.BDDfy.Configuration;`
`5`	`5`	`using TestStack.BDDfy.Core;`
`6`		`-using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes;`
`7`		`-using TestStack.BDDfy.Scanners.StepScanners.Fluent;`
	`6`	`+using TestStack.BDDfy.Scanners;`
`8`	`7`
`9`	`8`	`namespace TestStack.BDDfy.Tests.Configuration`
`10`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System.Linq;`
`3`	`3`	`using NUnit.Framework;`
`4`	`4`	`using TestStack.BDDfy.Core;`
`5`		`-using TestStack.BDDfy.Scanners.StepScanners.Fluent;`
	`5`	`+using TestStack.BDDfy.Scanners;`
`6`	`6`
`7`	`7`	`namespace TestStack.BDDfy.Tests.Exceptions`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using System.Linq;`
`6`	`6`	`using TestStack.BDDfy.Configuration;`
`7`	`7`	`using TestStack.BDDfy.Core;`
`8`		`-using TestStack.BDDfy.Scanners.StepScanners.Fluent;`
	`8`	`+using TestStack.BDDfy.Scanners;`
`9`	`9`
`10`	`10`	`namespace TestStack.BDDfy.Tests.FluentScanner`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,7 @@`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Collections.Generic;`
`5`	`5`	`using TestStack.BDDfy.Core;`
`6`		`-using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes;`
`7`		`-using TestStack.BDDfy.Scanners.StepScanners.Fluent;`
	`6`	`+using TestStack.BDDfy.Scanners;`
`8`	`7`
`9`	`8`	`namespace TestStack.BDDfy.Tests.FluentScanner`
`10`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System.Text.RegularExpressions;`
`3`	`3`	`using NUnit.Framework;`
`4`	`4`	`using TestStack.BDDfy.Processors;`
`5`		`-using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes;`
	`5`	`+using TestStack.BDDfy.Scanners;`
`6`	`6`
`7`	`7`	`namespace TestStack.BDDfy.Tests.Processors.Reports.MarkDown`
`8`	`8`	`{`