diff --git a/Azaion.Annotator/Azaion.Annotator.Test/Azaion.Annotator.Test.csproj b/Azaion.Annotator.Test/Azaion.Annotator.Test.csproj
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator.Test/Azaion.Annotator.Test.csproj
rename to Azaion.Annotator.Test/Azaion.Annotator.Test.csproj
diff --git a/Azaion.Annotator/Azaion.Annotator.Test/DictTest.cs b/Azaion.Annotator.Test/DictTest.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator.Test/DictTest.cs
rename to Azaion.Annotator.Test/DictTest.cs
diff --git a/Azaion.Annotator/Azaion.Annotator.sln b/Azaion.Annotator.sln
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator.sln
rename to Azaion.Annotator.sln
diff --git a/Azaion.Annotator/Azaion.Annotator/App.xaml b/Azaion.Annotator/App.xaml
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/App.xaml
rename to Azaion.Annotator/App.xaml
diff --git a/Azaion.Annotator/Azaion.Annotator/App.xaml.cs b/Azaion.Annotator/App.xaml.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/App.xaml.cs
rename to Azaion.Annotator/App.xaml.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/AssemblyInfo.cs b/Azaion.Annotator/AssemblyInfo.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/AssemblyInfo.cs
rename to Azaion.Annotator/AssemblyInfo.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/Azaion.Annotator.csproj b/Azaion.Annotator/Azaion.Annotator.csproj
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/Azaion.Annotator.csproj
rename to Azaion.Annotator/Azaion.Annotator.csproj
diff --git a/Azaion.Annotator/Azaion.Annotator/Controls/AnnotationControl.cs b/Azaion.Annotator/Controls/AnnotationControl.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/Controls/AnnotationControl.cs
rename to Azaion.Annotator/Controls/AnnotationControl.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/Controls/CanvasEditor.cs b/Azaion.Annotator/Controls/CanvasEditor.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/Controls/CanvasEditor.cs
rename to Azaion.Annotator/Controls/CanvasEditor.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/Controls/UpdatableProgressBar.cs b/Azaion.Annotator/Controls/UpdatableProgressBar.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/Controls/UpdatableProgressBar.cs
rename to Azaion.Annotator/Controls/UpdatableProgressBar.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/DTO/AnnClassSelectedEvent.cs b/Azaion.Annotator/DTO/AnnClassSelectedEvent.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/DTO/AnnClassSelectedEvent.cs
rename to Azaion.Annotator/DTO/AnnClassSelectedEvent.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/DTO/AnnotationClass.cs b/Azaion.Annotator/DTO/AnnotationClass.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/DTO/AnnotationClass.cs
rename to Azaion.Annotator/DTO/AnnotationClass.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/DTO/AnnotationInfo.cs b/Azaion.Annotator/DTO/AnnotationInfo.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/DTO/AnnotationInfo.cs
rename to Azaion.Annotator/DTO/AnnotationInfo.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/DTO/Config.cs b/Azaion.Annotator/DTO/Config.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/DTO/Config.cs
rename to Azaion.Annotator/DTO/Config.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/DTO/FormState.cs b/Azaion.Annotator/DTO/FormState.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/DTO/FormState.cs
rename to Azaion.Annotator/DTO/FormState.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/DTO/MediatrEvents.cs b/Azaion.Annotator/DTO/MediatrEvents.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/DTO/MediatrEvents.cs
rename to Azaion.Annotator/DTO/MediatrEvents.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/DTO/PlaybackControlEnum.cs b/Azaion.Annotator/DTO/PlaybackControlEnum.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/DTO/PlaybackControlEnum.cs
rename to Azaion.Annotator/DTO/PlaybackControlEnum.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/DTO/SelectionState.cs b/Azaion.Annotator/DTO/SelectionState.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/DTO/SelectionState.cs
rename to Azaion.Annotator/DTO/SelectionState.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/DTO/VideoFileInfo.cs b/Azaion.Annotator/DTO/VideoFileInfo.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/DTO/VideoFileInfo.cs
rename to Azaion.Annotator/DTO/VideoFileInfo.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/Extensions/CanvasExtensions.cs b/Azaion.Annotator/Extensions/CanvasExtensions.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/Extensions/CanvasExtensions.cs
rename to Azaion.Annotator/Extensions/CanvasExtensions.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/Extensions/ColorExtensions.cs b/Azaion.Annotator/Extensions/ColorExtensions.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/Extensions/ColorExtensions.cs
rename to Azaion.Annotator/Extensions/ColorExtensions.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/Extensions/DataGridExtensions.cs b/Azaion.Annotator/Extensions/DataGridExtensions.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/Extensions/DataGridExtensions.cs
rename to Azaion.Annotator/Extensions/DataGridExtensions.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/Extensions/DirectoryInfoExtensions.cs b/Azaion.Annotator/Extensions/DirectoryInfoExtensions.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/Extensions/DirectoryInfoExtensions.cs
rename to Azaion.Annotator/Extensions/DirectoryInfoExtensions.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/Extensions/SynchronizeInvokeExtensions.cs b/Azaion.Annotator/Extensions/SynchronizeInvokeExtensions.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/Extensions/SynchronizeInvokeExtensions.cs
rename to Azaion.Annotator/Extensions/SynchronizeInvokeExtensions.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/HelpTexts.cs b/Azaion.Annotator/HelpTexts.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/HelpTexts.cs
rename to Azaion.Annotator/HelpTexts.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/HelpWindow.xaml b/Azaion.Annotator/HelpWindow.xaml
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/HelpWindow.xaml
rename to Azaion.Annotator/HelpWindow.xaml
diff --git a/Azaion.Annotator/Azaion.Annotator/HelpWindow.xaml.cs b/Azaion.Annotator/HelpWindow.xaml.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/HelpWindow.xaml.cs
rename to Azaion.Annotator/HelpWindow.xaml.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/MainWindow.xaml b/Azaion.Annotator/MainWindow.xaml
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/MainWindow.xaml
rename to Azaion.Annotator/MainWindow.xaml
diff --git a/Azaion.Annotator/Azaion.Annotator/MainWindow.xaml.cs b/Azaion.Annotator/MainWindow.xaml.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/MainWindow.xaml.cs
rename to Azaion.Annotator/MainWindow.xaml.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/PlayerControlHandler.cs b/Azaion.Annotator/PlayerControlHandler.cs
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/PlayerControlHandler.cs
rename to Azaion.Annotator/PlayerControlHandler.cs
diff --git a/Azaion.Annotator/Azaion.Annotator/config.json b/Azaion.Annotator/config.json
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/config.json
rename to Azaion.Annotator/config.json
diff --git a/Azaion.Annotator/Azaion.Annotator/logo.ico b/Azaion.Annotator/logo.ico
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/logo.ico
rename to Azaion.Annotator/logo.ico
diff --git a/Azaion.Annotator/Azaion.Annotator/translations.json b/Azaion.Annotator/translations.json
similarity index 100%
rename from Azaion.Annotator/Azaion.Annotator/translations.json
rename to Azaion.Annotator/translations.json