Refactoring of the namespaces

src/Greenshot.Plugin.Box/BoxConfiguration.cs

@@ -19,13 +19,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using System.Windows.Forms;
-using GreenshotPlugin.Core;
 using System;
-using GreenshotBoxPlugin.Forms;
+using System.Windows.Forms;
+using Greenshot.Plugin.Box.Forms;
+using GreenshotPlugin.Core;
 using GreenshotPlugin.IniFile;
 
-namespace GreenshotBoxPlugin {
+namespace Greenshot.Plugin.Box {
 	/// <summary>
 	/// Description of ImgurConfiguration.
 	/// </summary>

src/Greenshot.Plugin.Box/BoxDestination.cs

@@ -18,12 +18,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 using System.ComponentModel;
 using System.Drawing;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.Interfaces;
 
-namespace GreenshotBoxPlugin {
+namespace Greenshot.Plugin.Box {
 	public class BoxDestination : AbstractDestination {
 		private readonly BoxPlugin _plugin;
 		public BoxDestination(BoxPlugin plugin) {

src/Greenshot.Plugin.Box/BoxEntities.cs

@@ -18,10 +18,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 
-namespace GreenshotBoxPlugin {
+namespace Greenshot.Plugin.Box {
 	[DataContract]
 	public class Authorization {
 		[DataMember(Name = "access_token")]

src/Greenshot.Plugin.Box/BoxPlugin.cs

@@ -18,6 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 using System;
 using System.ComponentModel;
 using System.Drawing;
@@ -29,7 +30,7 @@ using GreenshotPlugin.IniFile;
 using GreenshotPlugin.Interfaces;
 using GreenshotPlugin.Interfaces.Plugin;
 
-namespace GreenshotBoxPlugin {
+namespace Greenshot.Plugin.Box {
 	/// <summary>
 	/// This is the Box base code
 	/// </summary>

src/Greenshot.Plugin.Box/BoxUtils.cs

@@ -19,15 +19,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using GreenshotPlugin.Core;
 using System.Collections.Generic;
 using System.IO;
 using System.Runtime.Serialization.Json;
 using System.Text;
+using GreenshotPlugin.Core;
 using GreenshotPlugin.Core.OAuth;
 using GreenshotPlugin.IniFile;
 
-namespace GreenshotBoxPlugin {
+namespace Greenshot.Plugin.Box {
 
     /// <summary>
     /// Description of BoxUtils.

src/Greenshot.Plugin.Box/Forms/BoxForm.cs

@@ -18,9 +18,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 using GreenshotPlugin.Controls;
 
-namespace GreenshotBoxPlugin.Forms {
+namespace Greenshot.Plugin.Box.Forms {
 	public class BoxForm : GreenshotForm {
 	}
 }

src/Greenshot.Plugin.Box/Forms/SettingsForm.Designer.cs

@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-namespace GreenshotBoxPlugin.Forms {
+namespace Greenshot.Plugin.Box.Forms {
 	partial class SettingsForm {
 		/// <summary>
 		/// Designer variable used to keep track of non-visual components.

src/Greenshot.Plugin.Box/Forms/SettingsForm.cs

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace GreenshotBoxPlugin.Forms {
+namespace Greenshot.Plugin.Box.Forms {
 	/// <summary>
 	/// Description of PasswordRequestForm.
 	/// </summary>

src/Greenshot.Plugin.Box/Greenshot.Plugin.Box.Credentials.template

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace GreenshotBoxPlugin {
+namespace Greenshot.Plugin.Box {
 	/// <summary>
 	/// This class is merely a placeholder for the file keeping the API key and secret for Box integration.
 	/// You can set your own values here

src/Greenshot.Plugin.Box/Greenshot.Plugin.Box.csproj

@@ -1,10 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-
-  <PropertyGroup>
-    <RootNamespace>GreenshotBoxPlugin</RootNamespace>
-    <AssemblyName>GreenshotBoxPlugin</AssemblyName>
-  </PropertyGroup>
-
   <ItemGroup>
     <None Include="Languages\language*.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

src/Greenshot.Plugin.Box/LanguageKeys.cs

@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-namespace GreenshotBoxPlugin {
+namespace Greenshot.Plugin.Box {
 	public enum LangKey {
 		upload_menu_item,
 		upload_failure,

src/Greenshot.Plugin.Confluence/Confluence.cs

@@ -26,7 +26,7 @@ using GreenshotConfluencePlugin.confluence;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.IniFile;
 
-namespace GreenshotConfluencePlugin {
+namespace Greenshot.Plugin.Confluence {
     public class Page {
 		public Page(RemotePage page) {
 			Id = page.id;

src/Greenshot.Plugin.Confluence/ConfluenceConfiguration.cs

@@ -18,11 +18,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 using System;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.IniFile;
 
-namespace GreenshotConfluencePlugin {
+namespace Greenshot.Plugin.Confluence {
 	/// <summary>
 	/// Description of ConfluenceConfiguration.
 	/// </summary>

src/Greenshot.Plugin.Confluence/ConfluenceDestination.cs

@@ -18,6 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -31,7 +32,7 @@ using GreenshotPlugin.IniFile;
 using GreenshotPlugin.Interfaces;
 using GreenshotPlugin.Interfaces.Plugin;
 
-namespace GreenshotConfluencePlugin {
+namespace Greenshot.Plugin.Confluence {
 	/// <summary>
 	/// Description of ConfluenceDestination.
 	/// </summary>

src/Greenshot.Plugin.Confluence/ConfluencePlugin.cs

@@ -19,16 +19,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using GreenshotPlugin.Core;
 using System;
 using System.Windows;
-using GreenshotConfluencePlugin.Forms;
+using Greenshot.Plugin.Confluence.Forms;
-using GreenshotConfluencePlugin.Support;
+using Greenshot.Plugin.Confluence.Support;
+using GreenshotPlugin.Core;
 using GreenshotPlugin.IniFile;
 using GreenshotPlugin.Interfaces;
 using GreenshotPlugin.Interfaces.Plugin;
 
-namespace GreenshotConfluencePlugin {
+namespace Greenshot.Plugin.Confluence {
 	/// <summary>
 	/// This is the ConfluencePlugin base code
 	/// </summary>

src/Greenshot.Plugin.Confluence/ConfluenceUtils.cs

@@ -18,15 +18,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Automation;
-
 using GreenshotPlugin.Core;
 
-namespace GreenshotConfluencePlugin {
+namespace Greenshot.Plugin.Confluence {
 	/// <summary>
 	/// Description of ConfluenceUtils.
 	/// </summary>

src/Greenshot.Plugin.Confluence/EnumDisplayer.cs

@@ -18,6 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -25,10 +26,9 @@ using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Reflection;
 using System.Windows.Data;
-
 using GreenshotPlugin.Core;
 
-namespace GreenshotConfluencePlugin {
+namespace Greenshot.Plugin.Confluence {
 	public class EnumDisplayer : IValueConverter {
 		private Type _type;
 		private IDictionary _displayValues;

src/Greenshot.Plugin.Confluence/Forms/ConfluenceConfigurationForm.xaml

@@ -1,12 +1,13 @@
-<Window x:Class="GreenshotConfluencePlugin.Forms.ConfluenceConfigurationForm"
+<Window x:Class="Greenshot.Plugin.Confluence.Forms.ConfluenceConfigurationForm"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:gscp="clr-namespace:GreenshotConfluencePlugin"
 	xmlns:gsc="clr-namespace:GreenshotPlugin.Core;assembly=GreenshotPlugin"
-	xmlns:support="clr-namespace:GreenshotConfluencePlugin.Support"
+	xmlns:support="clr-namespace:Greenshot.Plugin.Confluence.Support"
+	xmlns:confluence="clr-namespace:Greenshot.Plugin.Confluence"
 	Title="{support:Translate plugin_settings}" SizeToContent="WidthAndHeight" ResizeMode="NoResize" Icon="/GreenshotConfluencePlugin;component/Images/Confluence.ico">
 	<Window.Resources>
-        <gscp:EnumDisplayer Type="{x:Type gsc:OutputFormat}" x:Key="outputFormats"/>
+        <confluence:EnumDisplayer Type="{x:Type gsc:OutputFormat}" x:Key="outputFormats"/>
 	</Window.Resources>
 
 	<StackPanel>

src/Greenshot.Plugin.Confluence/Forms/ConfluenceConfigurationForm.xaml.cs

@@ -21,7 +21,7 @@
 
 using System.Windows;
 
-namespace GreenshotConfluencePlugin.Forms {
+namespace Greenshot.Plugin.Confluence.Forms {
 	/// <summary>
 	/// Interaction logic for ConfluenceConfigurationForm.xaml
 	/// </summary>

src/Greenshot.Plugin.Confluence/Forms/ConfluencePagePicker.xaml

@@ -1,4 +1,4 @@
-<Page x:Class="GreenshotConfluencePlugin.Forms.ConfluencePagePicker"
+<Page x:Class="Greenshot.Plugin.Confluence.Forms.ConfluencePagePicker"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	Loaded="Page_Loaded">

src/Greenshot.Plugin.Confluence/Forms/ConfluencePagePicker.xaml.cs

@@ -21,7 +21,7 @@
 
 using System.Collections.Generic;
 
-namespace GreenshotConfluencePlugin.Forms {
+namespace Greenshot.Plugin.Confluence.Forms {
 	/// <summary>
 	/// Interaction logic for ConfluencePagePicker.xaml
 	/// </summary>

src/Greenshot.Plugin.Confluence/Forms/ConfluenceSearch.xaml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Page x:Class="GreenshotConfluencePlugin.Forms.ConfluenceSearch"
+<Page x:Class="Greenshot.Plugin.Confluence.Forms.ConfluenceSearch"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:support="clr-namespace:GreenshotConfluencePlugin.Support"
+    xmlns:support="clr-namespace:Greenshot.Plugin.Confluence.Support"
     Loaded="Page_Loaded">
 	<Grid MaxHeight="500">
 		<Grid.ColumnDefinitions>

src/Greenshot.Plugin.Confluence/Forms/ConfluenceSearch.xaml.cs

@@ -25,7 +25,7 @@ using System.Linq;
 using System.Windows;
 using GreenshotPlugin.IniFile;
 
-namespace GreenshotConfluencePlugin.Forms {
+namespace Greenshot.Plugin.Confluence.Forms {
 	public partial class ConfluenceSearch
 	{
 		private static readonly ConfluenceConfiguration ConfluenceConfig = IniConfig.GetIniSection<ConfluenceConfiguration>();

src/Greenshot.Plugin.Confluence/Forms/ConfluenceTreePicker.xaml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Page x:Class="GreenshotConfluencePlugin.Forms.ConfluenceTreePicker"
+<Page x:Class="Greenshot.Plugin.Confluence.Forms.ConfluenceTreePicker"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:support="clr-namespace:GreenshotConfluencePlugin.Support"
+    xmlns:support="clr-namespace:Greenshot.Plugin.Confluence.Support"
     Loaded="Page_Loaded">
 	<Grid Width="500">
 		<TreeView Name="ConfluenceTreeView" MaxHeight="500"

src/Greenshot.Plugin.Confluence/Forms/ConfluenceTreePicker.xaml.cs

@@ -27,7 +27,7 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Threading;
 
-namespace GreenshotConfluencePlugin.Forms {
+namespace Greenshot.Plugin.Confluence.Forms {
 	/// <summary>
 	/// Interaction logic for ConfluenceTreePicker.xaml
 	/// </summary>

src/Greenshot.Plugin.Confluence/Forms/ConfluenceUpload.xaml

@@ -1,7 +1,7 @@
-<Window x:Class="GreenshotConfluencePlugin.Forms.ConfluenceUpload"
+<Window x:Class="Greenshot.Plugin.Confluence.Forms.ConfluenceUpload"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:support="clr-namespace:GreenshotConfluencePlugin.Support"
+	xmlns:support="clr-namespace:Greenshot.Plugin.Confluence.Support"
 	Title="{support:Translate upload_menu_item}" Height="640" Width="500" Icon="/GreenshotConfluencePlugin;component/Images/Confluence.ico">
 	<StackPanel>
 		<TabControl>

src/Greenshot.Plugin.Confluence/Forms/ConfluenceUpload.xaml.cs

@@ -25,7 +25,7 @@ using System.Linq;
 using System.Threading;
 using System.Windows;
 
-namespace GreenshotConfluencePlugin.Forms {
+namespace Greenshot.Plugin.Confluence.Forms {
 	/// <summary>
 	/// Interaction logic for ConfluenceUpload.xaml
 	/// </summary>

src/Greenshot.Plugin.Confluence/Greenshot.Plugin.Confluence.csproj

@@ -1,10 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-
-  <PropertyGroup>
-    <RootNamespace>GreenshotConfluencePlugin</RootNamespace>
-    <AssemblyName>GreenshotConfluencePlugin</AssemblyName>
-  </PropertyGroup>
-
   <ItemGroup>
     <None Include="Languages\language*.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

src/Greenshot.Plugin.Confluence/LanguageKeys.cs

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace GreenshotConfluencePlugin {
+namespace Greenshot.Plugin.Confluence {
 	public enum LangKey {
 		login_error,
 		upload_menu_item,

src/Greenshot.Plugin.Confluence/Support/ITranslationProvider.cs

@@ -1,4 +1,4 @@
-namespace GreenshotConfluencePlugin.Support {
+namespace Greenshot.Plugin.Confluence.Support {
     public interface ITranslationProvider {
         /// <summary>
         /// Translates the specified key.

src/Greenshot.Plugin.Confluence/Support/LanguageChangedEventManager.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows;
 
-namespace GreenshotConfluencePlugin.Support
+namespace Greenshot.Plugin.Confluence.Support
 {
     public class LanguageChangedEventManager : WeakEventManager
     {

src/Greenshot.Plugin.Confluence/Support/LanguageXMLTranslationProvider.cs

@@ -1,6 +1,6 @@
 using GreenshotPlugin.Core;
 
-namespace GreenshotConfluencePlugin.Support {
+namespace Greenshot.Plugin.Confluence.Support {
 	/// <summary>
 	/// 
 	/// </summary>

src/Greenshot.Plugin.Confluence/Support/TranslateExtension.cs

@@ -2,7 +2,7 @@
 using System.Windows.Data;
 using System.Windows.Markup;
 
-namespace GreenshotConfluencePlugin.Support
+namespace Greenshot.Plugin.Confluence.Support
 {
     /// <summary>
     /// The Translate Markup extension returns a binding to a TranslationData

src/Greenshot.Plugin.Confluence/Support/TranslationData.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Windows;
 
-namespace GreenshotConfluencePlugin.Support {
+namespace Greenshot.Plugin.Confluence.Support {
 	public class TranslationData : IWeakEventListener, INotifyPropertyChanged {
         private readonly string _key;
 

src/Greenshot.Plugin.Confluence/Support/TranslationManager.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace GreenshotConfluencePlugin.Support {
+namespace Greenshot.Plugin.Confluence.Support {
 	public class TranslationManager {
 		private static TranslationManager _translationManager;
 

src/Greenshot.Plugin.Dropbox/DropboxDestination.cs

@@ -18,13 +18,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 using System.ComponentModel;
 using System.Drawing;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.IniFile;
 using GreenshotPlugin.Interfaces;
 
-namespace GreenshotDropboxPlugin {
+namespace Greenshot.Plugin.Dropbox {
 	internal class DropboxDestination : AbstractDestination {
 		private static readonly DropboxPluginConfiguration DropboxConfig = IniConfig.GetIniSection<DropboxPluginConfiguration>();
 

src/Greenshot.Plugin.Dropbox/DropboxPlugin.cs

@@ -18,6 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 using System;
 using System.ComponentModel;
 using System.Drawing;
@@ -28,7 +29,7 @@ using GreenshotPlugin.IniFile;
 using GreenshotPlugin.Interfaces;
 using GreenshotPlugin.Interfaces.Plugin;
 
-namespace GreenshotDropboxPlugin {
+namespace Greenshot.Plugin.Dropbox {
 	/// <summary>
 	/// This is the Dropbox base code
 	/// </summary>

src/Greenshot.Plugin.Dropbox/DropboxPluginConfiguration.cs

@@ -21,12 +21,11 @@
 
 using System;
 using System.Windows.Forms;
-using GreenshotDropboxPlugin.Forms;
+using Greenshot.Plugin.Dropbox.Forms;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.IniFile;
 
-
+namespace Greenshot.Plugin.Dropbox {
-namespace GreenshotDropboxPlugin {
 	/// <summary>
 	/// Description of ImgurConfiguration.
 	/// </summary>

src/Greenshot.Plugin.Dropbox/DropboxUtils.cs

@@ -18,6 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -28,7 +29,7 @@ using GreenshotPlugin.Interfaces;
 using GreenshotPlugin.Interfaces.Plugin;
 using Newtonsoft.Json;
 
-namespace GreenshotDropboxPlugin {
+namespace Greenshot.Plugin.Dropbox {
 	/// <summary>
 	/// Description of DropboxUtils.
 	/// </summary>

src/Greenshot.Plugin.Dropbox/Forms/DropboxForm.cs

@@ -21,7 +21,7 @@
 
 using GreenshotPlugin.Controls;
 
-namespace GreenshotDropboxPlugin.Forms {
+namespace Greenshot.Plugin.Dropbox.Forms {
 	public class DropboxForm : GreenshotForm {
 	}
 }

src/Greenshot.Plugin.Dropbox/Forms/SettingsForm.Designer.cs

@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-namespace GreenshotDropboxPlugin.Forms {
+namespace Greenshot.Plugin.Dropbox.Forms {
 	partial class SettingsForm {
 		/// <summary>
 		/// Designer variable used to keep track of non-visual components.

src/Greenshot.Plugin.Dropbox/Forms/SettingsForm.cs

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace GreenshotDropboxPlugin.Forms {
+namespace Greenshot.Plugin.Dropbox.Forms {
 	/// <summary>
 	/// Description of PasswordRequestForm.
 	/// </summary>

src/Greenshot.Plugin.Dropbox/Greenshot.Plugin.Dropbox.Credentials.template

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace GreenshotDropboxPlugin {
+namespace Greenshot.Plugin.Dropbox {
 	/// <summary>
 	/// This class is merely a placeholder for the file keeping the API key and secret for dropbox integration.
 	/// You can set your own values here

src/Greenshot.Plugin.Dropbox/Greenshot.Plugin.Dropbox.csproj

@@ -1,10 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-
-  <PropertyGroup>
-    <RootNamespace>GreenshotDropboxPlugin</RootNamespace>
-    <AssemblyName>GreenshotDropboxPlugin</AssemblyName>
-  </PropertyGroup>
-
   <ItemGroup>
     <None Include="Languages\language*.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

src/Greenshot.Plugin.Dropbox/LanguageKeys.cs

@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-namespace GreenshotDropboxPlugin {
+namespace Greenshot.Plugin.Dropbox {
 	public enum LangKey {
 		upload_menu_item,
 		upload_failure,

src/Greenshot.Plugin.ExternalCommand/ExternalCommandConfiguration.cs

@@ -25,7 +25,7 @@ using System.IO;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.IniFile;
 
-namespace GreenshotExternalCommandPlugin {
+namespace Greenshot.Plugin.ExternalCommand {
 	/// <summary>
 	/// Description of FlickrConfiguration.
 	/// </summary>

src/Greenshot.Plugin.ExternalCommand/ExternalCommandDestination.cs

@@ -31,7 +31,7 @@ using GreenshotPlugin.IniFile;
 using GreenshotPlugin.Interfaces;
 using GreenshotPlugin.Interfaces.Plugin;
 
-namespace GreenshotExternalCommandPlugin {
+namespace Greenshot.Plugin.ExternalCommand {
 	/// <summary>
 	/// Description of OCRDestination.
 	/// </summary>

src/Greenshot.Plugin.ExternalCommand/ExternalCommandForm.cs

@@ -21,7 +21,7 @@
 
 using GreenshotPlugin.Controls;
 
-namespace GreenshotExternalCommandPlugin {
+namespace Greenshot.Plugin.ExternalCommand {
 	/// <summary>
 	/// This class is needed for design-time resolving of the language files
 	/// </summary>

src/Greenshot.Plugin.ExternalCommand/ExternalCommandPlugin.cs

@@ -29,7 +29,7 @@ using GreenshotPlugin.IniFile;
 using GreenshotPlugin.Interfaces;
 using GreenshotPlugin.Interfaces.Plugin;
 
-namespace GreenshotExternalCommandPlugin
+namespace Greenshot.Plugin.ExternalCommand
 {
     /// <summary>
     /// An Plugin to run commands after an image was written

src/Greenshot.Plugin.ExternalCommand/Greenshot.Plugin.ExternalCommand.csproj

@@ -1,10 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-
-  <PropertyGroup>
-    <RootNamespace>GreenshotExternalCommandPlugin</RootNamespace>
-    <AssemblyName>GreenshotExternalCommandPlugin</AssemblyName>
-  </PropertyGroup>
-
   <ItemGroup>
     <None Include="Languages\language*.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

src/Greenshot.Plugin.ExternalCommand/IconCache.cs

@@ -25,7 +25,7 @@ using System.IO;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.IniFile;
 
-namespace GreenshotExternalCommandPlugin {
+namespace Greenshot.Plugin.ExternalCommand {
 	public static class IconCache {
 		private static readonly ExternalCommandConfiguration config = IniConfig.GetIniSection<ExternalCommandConfiguration>();
 		private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(IconCache));

src/Greenshot.Plugin.ExternalCommand/SettingsForm.Designer.cs

@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-namespace GreenshotExternalCommandPlugin {
+namespace Greenshot.Plugin.ExternalCommand {
 	partial class SettingsForm {
 		/// <summary>
 		/// Designer variable used to keep track of non-visual components.

src/Greenshot.Plugin.ExternalCommand/SettingsForm.cs

@@ -24,7 +24,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using GreenshotPlugin.IniFile;
 
-namespace GreenshotExternalCommandPlugin {
+namespace Greenshot.Plugin.ExternalCommand {
 	/// <summary>
 	/// Description of SettingsForm.
 	/// </summary>

src/Greenshot.Plugin.ExternalCommand/SettingsFormDetail.Designer.cs

@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-namespace GreenshotExternalCommandPlugin {
+namespace Greenshot.Plugin.ExternalCommand {
 	partial class SettingsFormDetail {
 		/// <summary>
 		/// Designer variable used to keep track of non-visual components.

src/Greenshot.Plugin.ExternalCommand/SettingsFormDetail.cs

@@ -26,7 +26,7 @@ using System.Windows.Forms;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.IniFile;
 
-namespace GreenshotExternalCommandPlugin {
+namespace Greenshot.Plugin.ExternalCommand {
 	/// <summary>
 	/// Description of SettingsFormDetail.
 	/// </summary>

src/Greenshot.Plugin.Flickr/FlickrConfiguration.cs

@@ -18,12 +18,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 using System.Windows.Forms;
-using GreenshotFlickrPlugin.Forms;
+using Greenshot.Plugin.Flickr.Forms;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.IniFile;
 
-namespace GreenshotFlickrPlugin {
+namespace Greenshot.Plugin.Flickr {
 	public enum SafetyLevel {
 		Safe = 1,
 		Moderate = 2,

src/Greenshot.Plugin.Flickr/FlickrDestination.cs

@@ -18,12 +18,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 using System.ComponentModel;
 using System.Drawing;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.Interfaces;
 
-namespace GreenshotFlickrPlugin {
+namespace Greenshot.Plugin.Flickr {
 	public class FlickrDestination : AbstractDestination {
 		private readonly FlickrPlugin _plugin;
 		public FlickrDestination(FlickrPlugin plugin) {

src/Greenshot.Plugin.Flickr/FlickrPlugin.cs

@@ -31,7 +31,7 @@ using GreenshotPlugin.Interfaces;
 using GreenshotPlugin.Interfaces.Plugin;
 using log4net;
 
-namespace GreenshotFlickrPlugin
+namespace Greenshot.Plugin.Flickr
 {
 	/// <summary>
 	/// This is the Flickr base code

src/Greenshot.Plugin.Flickr/FlickrUtils.cs

@@ -30,7 +30,7 @@ using GreenshotPlugin.Interfaces;
 using GreenshotPlugin.Interfaces.Plugin;
 using log4net;
 
-namespace GreenshotFlickrPlugin {
+namespace Greenshot.Plugin.Flickr {
 	/// <summary>
 	/// Description of FlickrUtils.
 	/// </summary>

src/Greenshot.Plugin.Flickr/Forms/FlickrForm.cs

@@ -21,7 +21,7 @@
 
 using GreenshotPlugin.Controls;
 
-namespace GreenshotFlickrPlugin.Forms {
+namespace Greenshot.Plugin.Flickr.Forms {
 	public class FlickrForm : GreenshotForm {
 	}
 }

src/Greenshot.Plugin.Flickr/Forms/SettingsForm.Designer.cs

@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-namespace GreenshotFlickrPlugin.Forms {
+namespace Greenshot.Plugin.Flickr.Forms {
 	partial class SettingsForm {
 		/// <summary>
 		/// Designer variable used to keep track of non-visual components.

src/Greenshot.Plugin.Flickr/Forms/SettingsForm.cs

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace GreenshotFlickrPlugin.Forms {
+namespace Greenshot.Plugin.Flickr.Forms {
 	/// <summary>
 	/// Description of PasswordRequestForm.
 	/// </summary>

src/Greenshot.Plugin.Flickr/Greenshot.Plugin.Flickr.Credentials.template

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace GreenshotFlickrPlugin {
+namespace Greenshot.Plugin.Flickr {
 	/// <summary>
 	/// This class is merely a placeholder for the file keeping the API key and secret for dropbox integration.
 	/// You can set your own values here

src/Greenshot.Plugin.Flickr/Greenshot.Plugin.Flickr.csproj

@@ -1,10 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-
-  <PropertyGroup>
-    <RootNamespace>GreenshotFlickrPlugin</RootNamespace>
-    <AssemblyName>GreenshotFlickrPlugin</AssemblyName>
-  </PropertyGroup>
-
   <ItemGroup>
     <None Include="Languages\language*.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

src/Greenshot.Plugin.Flickr/LanguageKeys.cs

@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-namespace GreenshotFlickrPlugin {
+namespace Greenshot.Plugin.Flickr {
 	public enum LangKey {
 		upload_menu_item,
 		upload_failure,

src/Greenshot.Plugin.GooglePhotos/Forms/GooglePhotosForm.cs

@@ -20,7 +20,7 @@
 
 using GreenshotPlugin.Controls;
 
-namespace GreenshotGooglePhotosPlugin.Forms {
+namespace Greenshot.Plugin.GooglePhotos.Forms {
 	public class GooglePhotosForm : GreenshotForm {
 	}
 }

src/Greenshot.Plugin.GooglePhotos/Forms/SettingsForm.Designer.cs

@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-namespace GreenshotGooglePhotosPlugin.Forms {
+namespace Greenshot.Plugin.GooglePhotos.Forms {
 	partial class SettingsForm {
 		/// <summary>
 		/// Designer variable used to keep track of non-visual components.

src/Greenshot.Plugin.GooglePhotos/Forms/SettingsForm.cs

@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace GreenshotGooglePhotosPlugin.Forms {
+namespace Greenshot.Plugin.GooglePhotos.Forms {
 	/// <summary>
 	/// Description of PasswordRequestForm.
 	/// </summary>

src/Greenshot.Plugin.GooglePhotos/GooglePhotosConfiguration.cs

@@ -17,13 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-using System.Windows.Forms;
+
-using GreenshotPlugin.Core;
 using System;
-using GreenshotGooglePhotosPlugin.Forms;
+using System.Windows.Forms;
+using Greenshot.Plugin.GooglePhotos.Forms;
+using GreenshotPlugin.Core;
 using GreenshotPlugin.IniFile;
 
-namespace GreenshotGooglePhotosPlugin {
+namespace Greenshot.Plugin.GooglePhotos {
 	/// <summary>
 	/// Description of GooglePhotosConfiguration.
 	/// </summary>

src/Greenshot.Plugin.GooglePhotos/GooglePhotosDestination.cs

@@ -17,12 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 using System.ComponentModel;
 using System.Drawing;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.Interfaces;
 
-namespace GreenshotGooglePhotosPlugin {
+namespace Greenshot.Plugin.GooglePhotos {
 	public class GooglePhotosDestination : AbstractDestination {
 		private readonly GooglePhotosPlugin _plugin;
 		public GooglePhotosDestination(GooglePhotosPlugin plugin) {

src/Greenshot.Plugin.GooglePhotos/GooglePhotosPlugin.cs

@@ -17,6 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 using System;
 using System.ComponentModel;
 using System.Drawing;
@@ -28,7 +29,7 @@ using GreenshotPlugin.IniFile;
 using GreenshotPlugin.Interfaces;
 using GreenshotPlugin.Interfaces.Plugin;
 
-namespace GreenshotGooglePhotosPlugin {
+namespace Greenshot.Plugin.GooglePhotos {
 	/// <summary>
 	/// This is the GooglePhotos base code
 	/// </summary>

src/Greenshot.Plugin.GooglePhotos/GooglePhotosUtils.cs

@@ -18,15 +18,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using GreenshotPlugin.Core;
 using System;
 using System.Xml;
+using GreenshotPlugin.Core;
 using GreenshotPlugin.Core.OAuth;
 using GreenshotPlugin.IniFile;
 using GreenshotPlugin.Interfaces;
 using GreenshotPlugin.Interfaces.Plugin;
 
-namespace GreenshotGooglePhotosPlugin {
+namespace Greenshot.Plugin.GooglePhotos {
 	/// <summary>
 	/// Description of GooglePhotosUtils.
 	/// </summary>

src/Greenshot.Plugin.GooglePhotos/Greenshot.Plugin.GooglePhotos.Credentials.template

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace GreenshotGooglePhotosPlugin {
+namespace Greenshot.Plugin.GooglePhotos {
 	/// <summary>
 	/// This class is merely a placeholder for the file keeping the API key and secret for dropbox integration.
 	/// You can set your own values here

src/Greenshot.Plugin.GooglePhotos/Greenshot.Plugin.GooglePhotos.csproj

@@ -6,7 +6,7 @@
   </ItemGroup>
 
   <ItemGroup>
-	<EmbeddedResource Include="GooglePhotos.png" />
+	  <EmbeddedResource Include="GooglePhotos.png" />
   </ItemGroup>
 
   <ItemGroup>

src/Greenshot.Plugin.GooglePhotos/LanguageKeys.cs

@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace GreenshotGooglePhotosPlugin {
+namespace Greenshot.Plugin.GooglePhotos {
 	public enum LangKey
 	{
 		upload_menu_item,

src/Greenshot.Plugin.Imgur/Forms/ImgurForm.cs

@@ -21,7 +21,7 @@
 
 using GreenshotPlugin.Controls;
 
-namespace GreenshotImgurPlugin.Forms {
+namespace Greenshot.Plugin.Imgur.Forms {
 	/// <summary>
 	/// This class is needed for design-time resolving of the language files
 	/// </summary>

src/Greenshot.Plugin.Imgur/Forms/ImgurHistory.Designer.cs

@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-namespace GreenshotImgurPlugin.Forms
+namespace Greenshot.Plugin.Imgur.Forms
 {
 	partial class ImgurHistory
 	{

src/Greenshot.Plugin.Imgur/Forms/ImgurHistory.cs

@@ -27,7 +27,7 @@ using GreenshotPlugin.Controls;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.IniFile;
 
-namespace GreenshotImgurPlugin.Forms {
+namespace Greenshot.Plugin.Imgur.Forms {
 	/// <summary>
 	/// Imgur history form
 	/// </summary>

src/Greenshot.Plugin.Imgur/Forms/SettingsForm.Designer.cs

@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-namespace GreenshotImgurPlugin.Forms {
+namespace Greenshot.Plugin.Imgur.Forms {
 	partial class SettingsForm {
 		/// <summary>
 		/// Designer variable used to keep track of non-visual components.

src/Greenshot.Plugin.Imgur/Forms/SettingsForm.cs

@@ -21,7 +21,7 @@
 
 using System;
 
-namespace GreenshotImgurPlugin.Forms {
+namespace Greenshot.Plugin.Imgur.Forms {
 	/// <summary>
 	/// Description of PasswordRequestForm.
 	/// </summary>

src/Greenshot.Plugin.Imgur/Greenshot.Plugin.Imgur.Credentials.template

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace GreenshotImgurPlugin {
+namespace Greenshot.Plugin.Imgur {
 	/// <summary>
 	/// This class is merely a placeholder for the file keeping the API key and secret for imgur integration.
 	/// You can set your own values here

src/Greenshot.Plugin.Imgur/Greenshot.Plugin.Imgur.csproj

@@ -1,10 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-
-  <PropertyGroup>
-    <RootNamespace>GreenshotImgurPlugin</RootNamespace>
-    <AssemblyName>GreenshotImgurPlugin</AssemblyName>
-  </PropertyGroup>
-
   <ItemGroup>
     <None Include="Languages\language*.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

src/Greenshot.Plugin.Imgur/ImgurConfiguration.cs

@@ -22,11 +22,11 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
-using GreenshotImgurPlugin.Forms;
+using Greenshot.Plugin.Imgur.Forms;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.IniFile;
 
-namespace GreenshotImgurPlugin {
+namespace Greenshot.Plugin.Imgur {
 	/// <summary>
 	/// Description of ImgurConfiguration.
 	/// </summary>

src/Greenshot.Plugin.Imgur/ImgurDestination.cs

@@ -18,12 +18,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 using System.ComponentModel;
 using System.Drawing;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.Interfaces;
 
-namespace GreenshotImgurPlugin  {
+namespace Greenshot.Plugin.Imgur  {
 	/// <summary>
 	/// Description of ImgurDestination.
 	/// </summary>

src/Greenshot.Plugin.Imgur/ImgurInfo.cs

@@ -18,11 +18,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 using System;
 using System.Drawing;
 using System.Xml;
 
-namespace GreenshotImgurPlugin
+namespace Greenshot.Plugin.Imgur
 {
 	/// <summary>
 	/// Description of ImgurInfo.

src/Greenshot.Plugin.Imgur/ImgurPlugin.cs

@@ -18,20 +18,21 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
-using GreenshotImgurPlugin.Forms;
+using Greenshot.Plugin.Imgur.Forms;
 using GreenshotPlugin.Controls;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.IniFile;
 using GreenshotPlugin.Interfaces;
 using GreenshotPlugin.Interfaces.Plugin;
 
-namespace GreenshotImgurPlugin {
+namespace Greenshot.Plugin.Imgur {
 	/// <summary>
 	/// This is the ImgurPlugin code
 	/// </summary>

src/Greenshot.Plugin.Imgur/ImgurUtils.cs

@@ -18,6 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -29,7 +30,7 @@ using GreenshotPlugin.IniFile;
 using GreenshotPlugin.Interfaces;
 using GreenshotPlugin.Interfaces.Plugin;
 
-namespace GreenshotImgurPlugin {
+namespace Greenshot.Plugin.Imgur {
 	/// <summary>
 	/// A collection of Imgur helper methods
 	/// </summary>

src/Greenshot.Plugin.Imgur/LanguageKeys.cs

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace GreenshotImgurPlugin {
+namespace Greenshot.Plugin.Imgur {
 	public enum LangKey {
 		upload_menu_item,
 		upload_failure,

src/Greenshot.Plugin.Jira/AsyncMemoryCache.cs

@@ -25,8 +25,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Dapplo.Log;
 
-
+namespace Greenshot.Plugin.Jira
-namespace GreenshotJiraPlugin
 {
 	/// <summary>
 	///     This abstract class builds a base for a simple async memory cache.

src/Greenshot.Plugin.Jira/Forms/JiraForm.Designer.cs

@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-namespace GreenshotJiraPlugin.Forms {
+namespace Greenshot.Plugin.Jira.Forms {
 	partial class JiraForm {
 		/// <summary>
 		/// Required designer variable.

src/Greenshot.Plugin.Jira/Forms/JiraForm.cs

@@ -20,17 +20,17 @@
  */
 
 using System;
-using System.Windows.Forms;
-using Dapplo.Jira.Entities;
-using GreenshotPlugin.Controls;
-using GreenshotPlugin.Core;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Windows.Forms;
+using Dapplo.Jira.Entities;
+using GreenshotPlugin.Controls;
+using GreenshotPlugin.Core;
 using GreenshotPlugin.IniFile;
 
-namespace GreenshotJiraPlugin.Forms {
+namespace Greenshot.Plugin.Jira.Forms {
 	public partial class JiraForm : Form {
 		private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(typeof(JiraForm));
 		private readonly JiraConnector _jiraConnector;

src/Greenshot.Plugin.Jira/Forms/JiraFormBase.cs

@@ -21,7 +21,7 @@
 
 using GreenshotPlugin.Controls;
 
-namespace GreenshotJiraPlugin.Forms {
+namespace Greenshot.Plugin.Jira.Forms {
 	public class JiraFormBase : GreenshotForm {
 	}
 }

src/Greenshot.Plugin.Jira/Forms/SettingsForm.Designer.cs

@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-namespace GreenshotJiraPlugin.Forms {
+namespace Greenshot.Plugin.Jira.Forms {
 	partial class SettingsForm {
 		/// <summary>
 		/// Designer variable used to keep track of non-visual components.

src/Greenshot.Plugin.Jira/Forms/SettingsForm.cs

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace GreenshotJiraPlugin.Forms {
+namespace Greenshot.Plugin.Jira.Forms {
 	/// <summary>
 	/// Description of PasswordRequestForm.
 	/// </summary>

src/Greenshot.Plugin.Jira/Greenshot.Plugin.Jira.csproj

@@ -1,10 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-
-  <PropertyGroup>
-    <RootNamespace>GreenshotJiraPlugin</RootNamespace>
-    <AssemblyName>GreenshotJiraPlugin</AssemblyName>
-  </PropertyGroup>
-
   <ItemGroup>
     <None Include="Languages\language*.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

src/Greenshot.Plugin.Jira/IssueTypeBitmapCache.cs

@@ -26,7 +26,7 @@ using System.Threading.Tasks;
 using Dapplo.Jira;
 using Dapplo.Jira.Entities;
 
-namespace GreenshotJiraPlugin
+namespace Greenshot.Plugin.Jira
 {
 	/// <summary>
 	/// This is the bach for the IssueType bitmaps

src/Greenshot.Plugin.Jira/JiraConfiguration.cs

@@ -22,7 +22,7 @@
 using GreenshotPlugin.Core;
 using GreenshotPlugin.IniFile;
 
-namespace GreenshotJiraPlugin {
+namespace Greenshot.Plugin.Jira {
 	/// <summary>
 	/// Description of JiraConfiguration.
 	/// </summary>

src/Greenshot.Plugin.Jira/JiraConnector.cs

@@ -34,7 +34,7 @@ using Dapplo.Jira.SvgWinForms.Converters;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.IniFile;
 
-namespace GreenshotJiraPlugin {
+namespace Greenshot.Plugin.Jira {
 	/// <summary>
 	/// This encapsulates the JiraClient to make it possible to change as less old Greenshot code as needed
 	/// </summary>

src/Greenshot.Plugin.Jira/JiraDestination.cs

@@ -27,14 +27,14 @@ using System.IO;
 using System.Windows.Forms;
 using Dapplo.HttpExtensions;
 using Dapplo.Jira.Entities;
-using GreenshotJiraPlugin.Forms;
+using Greenshot.Plugin.Jira.Forms;
 using GreenshotPlugin.Controls;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.IniFile;
 using GreenshotPlugin.Interfaces;
 using GreenshotPlugin.Interfaces.Plugin;
 
-namespace GreenshotJiraPlugin {
+namespace Greenshot.Plugin.Jira {
 	/// <summary>
 	/// Description of JiraDestination.
 	/// </summary>

src/Greenshot.Plugin.Jira/JiraDetails.cs

@@ -22,7 +22,7 @@
 using System;
 using Dapplo.Jira.Entities;
 
-namespace GreenshotJiraPlugin
+namespace Greenshot.Plugin.Jira
 {
 	public class JiraDetails : IComparable<JiraDetails>
 	{