diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj
index 3cd0f47c75..5d5633068e 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj
@@ -40,27 +40,38 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Configuration\AssemblyInfo.cs" />
-    <Compile Include="Src\Breakpoints\Breakpoint.cs" />
-    <Compile Include="Src\Breakpoints\BreakpointEventArgs.cs" />
-    <Compile Include="Src\Breakpoints\NDebugger-Breakpoints.cs" />
+    <Compile Include="Src\Control\Eval.cs" />
+    <Compile Include="Src\Control\Module.cs" />
+    <Compile Include="Src\Control\NDebugger-Breakpoints.cs" />
+    <Compile Include="Src\Control\NDebugger-Processes.cs" />
+    <Compile Include="Src\Control\NDebugger.cs" />
+    <Compile Include="Src\Control\Process-Evals.cs" />
+    <Compile Include="Src\Control\Process-Modules.cs" />
+    <Compile Include="Src\Control\Process-StateControl.cs" />
+    <Compile Include="Src\Control\Process-Threads.cs" />
+    <Compile Include="Src\Control\Process.cs" />
+    <Compile Include="Src\Control\ProcessEventArgs.cs" />
+    <Compile Include="Src\Control\StackFrame.cs" />
+    <Compile Include="Src\Control\Stepper.cs" />
+    <Compile Include="Src\Control\StepperEventArgs.cs" />
+    <Compile Include="Src\Control\Thread.cs" />
+    <Compile Include="Src\Control\ThreadEventArgs.cs" />
+    <Compile Include="Src\Debugger\Breakpoint.cs" />
     <Compile Include="Src\Debugger\DebugeeState.cs" />
-    <Compile Include="Src\Debugger\DebuggerEvents\DebuggerEventArgs.cs" />
-    <Compile Include="Src\Debugger\DebuggerEvents\MessageEventArgs.cs" />
-    <Compile Include="Src\Debugger\DebuggerEvents\PausedReason.cs" />
+    <Compile Include="Src\Debugger\DebuggerException.cs" />
     <Compile Include="Src\Debugger\DebuggerObject.cs" />
-    <Compile Include="Src\Debugger\ExceptionEventArgs.cs" />
-    <Compile Include="Src\Debugger\Exceptions.cs" />
+    <Compile Include="Src\Debugger\Exception.cs" />
+    <Compile Include="Src\Debugger\ExceptionType.cs" />
     <Compile Include="Src\Debugger\IExpirable.cs" />
-    <Compile Include="Src\Debugger\Internal\ManagedCallback.cs" />
-    <Compile Include="Src\Debugger\Internal\ManagedCallbackProxy.cs" />
-    <Compile Include="Src\Debugger\Internal\ManagedCallbackSwitch.cs" />
-    <Compile Include="Src\Debugger\Internal\MTA2STA.cs" />
-    <Compile Include="Src\Debugger\NDebugger.cs" />
+    <Compile Include="Src\Debugger\PausedReason.cs" />
     <Compile Include="Src\Debugger\PauseSession.cs" />
-    <Compile Include="Src\Debugger\Process-StateControl.cs" />
-    <Compile Include="Src\Evals\Eval.cs" />
-    <Compile Include="Src\Evals\EvalEventArgs.cs" />
-    <Compile Include="Src\Evals\Process-Evals.cs" />
+    <Compile Include="Src\Debugger\SourcecodeSegment.cs" />
+    <Compile Include="Src\EventArgs\BreakpointEventArgs.cs" />
+    <Compile Include="Src\EventArgs\DebuggerEventArgs.cs" />
+    <Compile Include="Src\EventArgs\EvalEventArgs.cs" />
+    <Compile Include="Src\EventArgs\ExceptionEventArgs.cs" />
+    <Compile Include="Src\EventArgs\MessageEventArgs.cs" />
+    <Compile Include="Src\EventArgs\ModuleEventArgs.cs" />
     <Compile Include="Src\Expressions\Ast\ArrayIndexerExpression.cs" />
     <Compile Include="Src\Expressions\Ast\EmptyExpression.cs" />
     <Compile Include="Src\Expressions\Ast\LocalVariableIdentifierExpression.cs" />
@@ -70,6 +81,12 @@
     <Compile Include="Src\Expressions\Ast\ThisReferenceExpression.cs" />
     <Compile Include="Src\Expressions\Expression.Create.cs" />
     <Compile Include="Src\Expressions\Expression.cs" />
+    <Compile Include="Src\Internal\ManagedCallback.cs" />
+    <Compile Include="Src\Internal\ManagedCallbackProxy.cs" />
+    <Compile Include="Src\Internal\ManagedCallbackSwitch.cs" />
+    <Compile Include="Src\Internal\MTA2STA.cs" />
+    <Compile Include="Src\Internal\Tests\ExpandAttribute.cs" />
+    <Compile Include="Src\Internal\Tests\IgnoreAttribute.cs" />
     <Compile Include="Src\Interop\CorDebug\CorDebug.cs" />
     <Compile Include="Src\Interop\CorDebug\CorDebugChainReason.cs" />
     <Compile Include="Src\Interop\CorDebug\CorDebugClass.cs" />
@@ -211,23 +228,6 @@
     <Compile Include="Src\Metadata\MemberInfo.cs" />
     <Compile Include="Src\Metadata\MethodInfo.cs" />
     <Compile Include="Src\Metadata\PropertyInfo.cs" />
-    <Compile Include="Src\Modules\Module.cs" />
-    <Compile Include="Src\Modules\ModuleEventArgs.cs" />
-    <Compile Include="Src\Modules\Process-Modules.cs" />
-    <Compile Include="Src\Tests\ExpandAttribute.cs" />
-    <Compile Include="Src\Tests\IgnoreAttribute.cs" />
-    <Compile Include="Src\Threads\Exception.cs" />
-    <Compile Include="Src\Threads\ExceptionType.cs" />
-    <Compile Include="Src\Threads\StackFrame.cs" />
-    <Compile Include="Src\Threads\NDebugger-Processes.cs" />
-    <Compile Include="Src\Threads\Process-Threads.cs" />
-    <Compile Include="Src\Threads\Process.cs" />
-    <Compile Include="Src\Threads\ProcessEventArgs.cs" />
-    <Compile Include="Src\Threads\SourcecodeSegment.cs" />
-    <Compile Include="Src\Threads\Stepper.cs" />
-    <Compile Include="Src\Threads\StepperEventArgs.cs" />
-    <Compile Include="Src\Threads\Thread.cs" />
-    <Compile Include="Src\Threads\ThreadEventArgs.cs" />
     <Compile Include="Src\Util\HighPrecisionTimer.cs" />
     <Compile Include="Src\Values\ArrayDimension.cs" />
     <Compile Include="Src\Values\ArrayDimensions.cs" />
@@ -383,22 +383,19 @@
     <Folder Include="Configuration" />
     <Folder Include="docs" />
     <Folder Include="Src" />
-    <Folder Include="Src\Breakpoints" />
+    <Folder Include="Src\Control" />
     <Folder Include="Src\Debugger" />
-    <Folder Include="Src\Debugger\DebuggerEvents" />
-    <Folder Include="Src\Debugger\Internal" />
-    <Folder Include="Src\Evals" />
+    <Folder Include="Src\EventArgs" />
     <Folder Include="Src\Expressions" />
     <Folder Include="Src\Expressions\Ast" />
+    <Folder Include="Src\Internal" />
+    <Folder Include="Src\Internal\Tests" />
     <Folder Include="Src\Interop" />
     <Folder Include="Src\Interop\CorDebug" />
     <Folder Include="Src\Interop\CorSym" />
     <Folder Include="Src\Interop\Enums" />
     <Folder Include="Src\Interop\MetaData" />
     <Folder Include="Src\Metadata" />
-    <Folder Include="Src\Modules" />
-    <Folder Include="Src\Tests" />
-    <Folder Include="Src\Threads" />
     <Folder Include="Src\Util" />
     <Folder Include="Src\Values" />
     <Folder Include="Src\Wrappers" />
@@ -409,4 +406,4 @@
     <Folder Include="Src\Wrappers\MetaData" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Evals/Eval.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Evals/Eval.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/Module.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Module.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/Module.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Module.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Breakpoints/NDebugger-Breakpoints.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/NDebugger-Breakpoints.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Breakpoints/NDebugger-Breakpoints.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/NDebugger-Breakpoints.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/NDebugger-Processes.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/NDebugger-Processes.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/NDebugger-Processes.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/NDebugger-Processes.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/NDebugger.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/NDebugger.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/NDebugger.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/NDebugger.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Evals/Process-Evals.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Process-Evals.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Evals/Process-Evals.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Process-Evals.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/Process-Modules.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Process-Modules.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/Process-Modules.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Process-Modules.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Process-StateControl.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Process-StateControl.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Process-StateControl.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Process-StateControl.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Process-Threads.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Process-Threads.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Process-Threads.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Process-Threads.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Process.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Process.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Process.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Process.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/ProcessEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/ProcessEventArgs.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/ProcessEventArgs.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/ProcessEventArgs.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/StackFrame.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/StackFrame.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/StackFrame.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/StackFrame.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Stepper.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Stepper.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Stepper.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Stepper.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/StepperEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/StepperEventArgs.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/StepperEventArgs.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/StepperEventArgs.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Thread.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Thread.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Thread.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Thread.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/ThreadEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/ThreadEventArgs.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/ThreadEventArgs.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/ThreadEventArgs.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Breakpoints/Breakpoint.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Breakpoint.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Breakpoints/Breakpoint.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Breakpoint.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Exceptions.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerException.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Exceptions.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerException.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Exception.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Exception.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Exception.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Exception.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/ExceptionType.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/ExceptionType.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/ExceptionType.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/ExceptionType.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerEvents/PausedReason.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/PausedReason.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerEvents/PausedReason.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/PausedReason.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/SourcecodeSegment.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/SourcecodeSegment.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/SourcecodeSegment.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/SourcecodeSegment.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Breakpoints/BreakpointEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/BreakpointEventArgs.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Breakpoints/BreakpointEventArgs.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/BreakpointEventArgs.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerEvents/DebuggerEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/DebuggerEventArgs.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerEvents/DebuggerEventArgs.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/DebuggerEventArgs.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Evals/EvalEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/EvalEventArgs.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Evals/EvalEventArgs.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/EvalEventArgs.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/ExceptionEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/ExceptionEventArgs.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/ExceptionEventArgs.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/ExceptionEventArgs.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerEvents/MessageEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/MessageEventArgs.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerEvents/MessageEventArgs.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/MessageEventArgs.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/ModuleEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/ModuleEventArgs.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/ModuleEventArgs.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/ModuleEventArgs.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/MTA2STA.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/MTA2STA.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/MTA2STA.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/MTA2STA.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallback.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallback.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallback.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallback.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallbackProxy.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallbackProxy.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallbackProxy.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallbackProxy.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallbackSwitch.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallbackSwitch.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallbackSwitch.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallbackSwitch.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Tests/ExpandAttribute.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/Tests/ExpandAttribute.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Tests/ExpandAttribute.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/Tests/ExpandAttribute.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Tests/IgnoreAttribute.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/Tests/IgnoreAttribute.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Tests/IgnoreAttribute.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/Tests/IgnoreAttribute.cs