diff --git a/Nuclex.Windows.Forms (net-4.0).csproj b/Nuclex.Windows.Forms (net-4.0).csproj
deleted file mode 100644
index 5ce0dec..0000000
--- a/Nuclex.Windows.Forms (net-4.0).csproj
+++ /dev/null
@@ -1,183 +0,0 @@
-
-
-
- Debug
- AnyCPU
- 8.0.30703
- 2.0
- {B2BFA3EC-3B7B-4EE0-8395-8426B5C7A8B8}
- Library
- Properties
- Nuclex.Windows.Forms
- Nuclex.Windows.Forms
- v4.0
- 512
-
-
- true
- full
- false
- bin\net-4.0\Debug\
- TRACE;DEBUG;UNITTEST
- prompt
- 4
- bin\net-4.0\Debug\Nuclex.Windows.Forms.xml
-
-
- pdbonly
- true
- bin\net-4.0\Release\
- TRACE;UNITTEST
- prompt
- 4
- bin\net-4.0\Release\Nuclex.Windows.Forms.xml
-
-
- true
-
-
- ..\Foundation.snk
-
-
-
- False
- ..\References\nunit\net-4.0\framework\nunit.framework.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- UserControl
-
-
- ProgressSpinner.cs
-
-
-
-
-
- MessageEventArgs.cs
-
-
-
-
- MessageText.cs
-
-
-
-
-
- DialogViewModel.cs
-
-
-
-
-
- ThreadedAction.cs
-
-
-
- ThreadedDialogViewModel.cs
-
-
-
- ThreadedViewModel.cs
-
-
-
-
-
- Form
-
-
- UserControl
-
-
- Form
-
-
-
- WindowManager.cs
-
-
- ProgressSpinner.cs
-
-
- ProgressReporterForm.cs
- Designer
-
-
- Component
-
-
- AsyncProgressBar.cs
-
-
- AsyncProgressBar.cs
-
-
- Component
-
-
- ContainerListView.cs
-
-
- ContainerListView.cs
-
-
-
- Form
-
-
- ProgressReporterForm.cs
-
-
- Component
-
-
- Component
-
-
- TrackingBar.cs
-
-
-
-
- {2f487c4d-8e06-496f-bcd5-7119b18c78d8}
- Nuclex.Support.Transactions %28net-4.0%29
-
-
- {00567408-4F44-4C00-866E-B04A99E482F2}
- Nuclex.Support %28net-4.0%29
-
-
-
-
- Foundation.snk
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Nuclex.Windows.Forms (net-4.6).csproj b/Nuclex.Windows.Forms (net-4.6).csproj
index 791abd5..e3260f0 100644
--- a/Nuclex.Windows.Forms (net-4.6).csproj
+++ b/Nuclex.Windows.Forms (net-4.6).csproj
@@ -73,34 +73,16 @@
-
- MessageEventArgs.cs
-
-
- MessageText.cs
-
-
- DialogViewModel.cs
-
-
- ThreadedAction.cs
-
-
- ThreadedDialogViewModel.cs
-
-
- ThreadedViewModel.cs
-
@@ -114,9 +96,6 @@
Form
-
- WindowManager.cs
-
ProgressSpinner.cs
@@ -130,18 +109,12 @@
AsyncProgressBar.cs
-
- AsyncProgressBar.cs
-
Component
ContainerListView.cs
-
- ContainerListView.cs
-
Form
diff --git a/Source/AsyncProgressBar/AsyncProgressBar.Test.cs b/Tests/AsyncProgressBar/AsyncProgressBarTest.cs
similarity index 100%
rename from Source/AsyncProgressBar/AsyncProgressBar.Test.cs
rename to Tests/AsyncProgressBar/AsyncProgressBarTest.cs
diff --git a/Source/ContainerListView/ContainerListView.Test.cs b/Tests/ContainerListView/ContainterListViewTest.cs
similarity index 100%
rename from Source/ContainerListView/ContainerListView.Test.cs
rename to Tests/ContainerListView/ContainterListViewTest.cs
diff --git a/Source/ViewModels/DialogViewModel.Test.cs b/Tests/DialogViewModelTest.cs
similarity index 100%
rename from Source/ViewModels/DialogViewModel.Test.cs
rename to Tests/DialogViewModelTest.cs
diff --git a/Source/Messages/MessageEventArgs.Test.cs b/Tests/Messages/MessageEventArgsTest.cs
similarity index 100%
rename from Source/Messages/MessageEventArgs.Test.cs
rename to Tests/Messages/MessageEventArgsTest.cs
diff --git a/Source/Messages/MessageText.Test.cs b/Tests/Messages/MessageTextTest.cs
similarity index 100%
rename from Source/Messages/MessageText.Test.cs
rename to Tests/Messages/MessageTextTest.cs
diff --git a/Source/ViewModels/ThreadedAction.Test.cs b/Tests/ViewModels/ThreadedActionTest.cs
similarity index 100%
rename from Source/ViewModels/ThreadedAction.Test.cs
rename to Tests/ViewModels/ThreadedActionTest.cs
diff --git a/Source/ViewModels/ThreadedDialogViewModel.Test.cs b/Tests/ViewModels/ThreadedDialogViewModelTest.cs
similarity index 100%
rename from Source/ViewModels/ThreadedDialogViewModel.Test.cs
rename to Tests/ViewModels/ThreadedDialogViewModelTest.cs
diff --git a/Source/ViewModels/ThreadedViewModel.Test.cs b/Tests/ViewModels/ThreadedViewModelTest.cs
similarity index 100%
rename from Source/ViewModels/ThreadedViewModel.Test.cs
rename to Tests/ViewModels/ThreadedViewModelTest.cs
diff --git a/Source/WindowManager.Test.cs b/Tests/WindowManagerTest.cs
similarity index 100%
rename from Source/WindowManager.Test.cs
rename to Tests/WindowManagerTest.cs