diff --git a/GreenshotImageEditor/Configuration/CoreConfiguration.cs b/Greenshot.ImageEditor/Configuration/CoreConfiguration.cs
similarity index 100%
rename from GreenshotImageEditor/Configuration/CoreConfiguration.cs
rename to Greenshot.ImageEditor/Configuration/CoreConfiguration.cs
diff --git a/GreenshotImageEditor/Configuration/EditorConfiguration.cs b/Greenshot.ImageEditor/Configuration/EditorConfiguration.cs
similarity index 100%
rename from GreenshotImageEditor/Configuration/EditorConfiguration.cs
rename to Greenshot.ImageEditor/Configuration/EditorConfiguration.cs
diff --git a/GreenshotImageEditor/Controls/AnimatingForm.cs b/Greenshot.ImageEditor/Controls/AnimatingForm.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/AnimatingForm.cs
rename to Greenshot.ImageEditor/Controls/AnimatingForm.cs
diff --git a/GreenshotImageEditor/Controls/BackgroundForm.cs b/Greenshot.ImageEditor/Controls/BackgroundForm.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/BackgroundForm.cs
rename to Greenshot.ImageEditor/Controls/BackgroundForm.cs
diff --git a/GreenshotImageEditor/Controls/BackgroundForm.designer.cs b/Greenshot.ImageEditor/Controls/BackgroundForm.designer.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/BackgroundForm.designer.cs
rename to Greenshot.ImageEditor/Controls/BackgroundForm.designer.cs
diff --git a/GreenshotImageEditor/Controls/BindableToolStripButton.cs b/Greenshot.ImageEditor/Controls/BindableToolStripButton.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/BindableToolStripButton.cs
rename to Greenshot.ImageEditor/Controls/BindableToolStripButton.cs
diff --git a/GreenshotImageEditor/Controls/BindableToolStripComboBox.cs b/Greenshot.ImageEditor/Controls/BindableToolStripComboBox.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/BindableToolStripComboBox.cs
rename to Greenshot.ImageEditor/Controls/BindableToolStripComboBox.cs
diff --git a/GreenshotImageEditor/Controls/BindableToolStripDropDownButton.cs b/Greenshot.ImageEditor/Controls/BindableToolStripDropDownButton.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/BindableToolStripDropDownButton.cs
rename to Greenshot.ImageEditor/Controls/BindableToolStripDropDownButton.cs
diff --git a/GreenshotImageEditor/Controls/ColorButton.cs b/Greenshot.ImageEditor/Controls/ColorButton.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/ColorButton.cs
rename to Greenshot.ImageEditor/Controls/ColorButton.cs
diff --git a/GreenshotImageEditor/Controls/FontFamilyComboBox.cs b/Greenshot.ImageEditor/Controls/FontFamilyComboBox.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/FontFamilyComboBox.cs
rename to Greenshot.ImageEditor/Controls/FontFamilyComboBox.cs
diff --git a/GreenshotImageEditor/Controls/FormWithoutActivation.cs b/Greenshot.ImageEditor/Controls/FormWithoutActivation.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/FormWithoutActivation.cs
rename to Greenshot.ImageEditor/Controls/FormWithoutActivation.cs
diff --git a/GreenshotImageEditor/Controls/GreenshotButton.cs b/Greenshot.ImageEditor/Controls/GreenshotButton.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/GreenshotButton.cs
rename to Greenshot.ImageEditor/Controls/GreenshotButton.cs
diff --git a/GreenshotImageEditor/Controls/GreenshotCheckBox.cs b/Greenshot.ImageEditor/Controls/GreenshotCheckBox.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/GreenshotCheckBox.cs
rename to Greenshot.ImageEditor/Controls/GreenshotCheckBox.cs
diff --git a/GreenshotImageEditor/Controls/GreenshotColumnSorter.cs b/Greenshot.ImageEditor/Controls/GreenshotColumnSorter.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/GreenshotColumnSorter.cs
rename to Greenshot.ImageEditor/Controls/GreenshotColumnSorter.cs
diff --git a/GreenshotImageEditor/Controls/GreenshotComboBox.cs b/Greenshot.ImageEditor/Controls/GreenshotComboBox.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/GreenshotComboBox.cs
rename to Greenshot.ImageEditor/Controls/GreenshotComboBox.cs
diff --git a/GreenshotImageEditor/Controls/GreenshotForm.cs b/Greenshot.ImageEditor/Controls/GreenshotForm.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/GreenshotForm.cs
rename to Greenshot.ImageEditor/Controls/GreenshotForm.cs
diff --git a/GreenshotImageEditor/Controls/GreenshotGroupBox.cs b/Greenshot.ImageEditor/Controls/GreenshotGroupBox.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/GreenshotGroupBox.cs
rename to Greenshot.ImageEditor/Controls/GreenshotGroupBox.cs
diff --git a/GreenshotImageEditor/Controls/GreenshotLabel.cs b/Greenshot.ImageEditor/Controls/GreenshotLabel.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/GreenshotLabel.cs
rename to Greenshot.ImageEditor/Controls/GreenshotLabel.cs
diff --git a/GreenshotImageEditor/Controls/GreenshotRadioButton.cs b/Greenshot.ImageEditor/Controls/GreenshotRadioButton.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/GreenshotRadioButton.cs
rename to Greenshot.ImageEditor/Controls/GreenshotRadioButton.cs
diff --git a/GreenshotImageEditor/Controls/GreenshotTabPage.cs b/Greenshot.ImageEditor/Controls/GreenshotTabPage.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/GreenshotTabPage.cs
rename to Greenshot.ImageEditor/Controls/GreenshotTabPage.cs
diff --git a/GreenshotImageEditor/Controls/GreenshotTextBox.cs b/Greenshot.ImageEditor/Controls/GreenshotTextBox.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/GreenshotTextBox.cs
rename to Greenshot.ImageEditor/Controls/GreenshotTextBox.cs
diff --git a/GreenshotImageEditor/Controls/GreenshotToolDropDownButton.cs b/Greenshot.ImageEditor/Controls/GreenshotToolDropDownButton.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/GreenshotToolDropDownButton.cs
rename to Greenshot.ImageEditor/Controls/GreenshotToolDropDownButton.cs
diff --git a/GreenshotImageEditor/Controls/GreenshotToolStripButton.cs b/Greenshot.ImageEditor/Controls/GreenshotToolStripButton.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/GreenshotToolStripButton.cs
rename to Greenshot.ImageEditor/Controls/GreenshotToolStripButton.cs
diff --git a/GreenshotImageEditor/Controls/GreenshotToolStripLabel.cs b/Greenshot.ImageEditor/Controls/GreenshotToolStripLabel.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/GreenshotToolStripLabel.cs
rename to Greenshot.ImageEditor/Controls/GreenshotToolStripLabel.cs
diff --git a/GreenshotImageEditor/Controls/GreenshotToolStripMenuItem.cs b/Greenshot.ImageEditor/Controls/GreenshotToolStripMenuItem.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/GreenshotToolStripMenuItem.cs
rename to Greenshot.ImageEditor/Controls/GreenshotToolStripMenuItem.cs
diff --git a/GreenshotImageEditor/Controls/IGreenshotConfigBindable.cs b/Greenshot.ImageEditor/Controls/IGreenshotConfigBindable.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/IGreenshotConfigBindable.cs
rename to Greenshot.ImageEditor/Controls/IGreenshotConfigBindable.cs
diff --git a/GreenshotImageEditor/Controls/IGreenshotLanguageBindable.cs b/Greenshot.ImageEditor/Controls/IGreenshotLanguageBindable.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/IGreenshotLanguageBindable.cs
rename to Greenshot.ImageEditor/Controls/IGreenshotLanguageBindable.cs
diff --git a/GreenshotImageEditor/Controls/MenuStripEx.cs b/Greenshot.ImageEditor/Controls/MenuStripEx.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/MenuStripEx.cs
rename to Greenshot.ImageEditor/Controls/MenuStripEx.cs
diff --git a/GreenshotImageEditor/Controls/NonJumpingPanel.cs b/Greenshot.ImageEditor/Controls/NonJumpingPanel.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/NonJumpingPanel.cs
rename to Greenshot.ImageEditor/Controls/NonJumpingPanel.cs
diff --git a/GreenshotImageEditor/Controls/Pipette.cs b/Greenshot.ImageEditor/Controls/Pipette.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/Pipette.cs
rename to Greenshot.ImageEditor/Controls/Pipette.cs
diff --git a/GreenshotImageEditor/Controls/PleaseWaitForm.cs b/Greenshot.ImageEditor/Controls/PleaseWaitForm.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/PleaseWaitForm.cs
rename to Greenshot.ImageEditor/Controls/PleaseWaitForm.cs
diff --git a/GreenshotImageEditor/Controls/PleaseWaitForm.designer.cs b/Greenshot.ImageEditor/Controls/PleaseWaitForm.designer.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/PleaseWaitForm.designer.cs
rename to Greenshot.ImageEditor/Controls/PleaseWaitForm.designer.cs
diff --git a/GreenshotImageEditor/Controls/QualityDialog.cs b/Greenshot.ImageEditor/Controls/QualityDialog.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/QualityDialog.cs
rename to Greenshot.ImageEditor/Controls/QualityDialog.cs
diff --git a/GreenshotImageEditor/Controls/QualityDialog.designer.cs b/Greenshot.ImageEditor/Controls/QualityDialog.designer.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/QualityDialog.designer.cs
rename to Greenshot.ImageEditor/Controls/QualityDialog.designer.cs
diff --git a/GreenshotImageEditor/Controls/SaveImageFileDialog.cs b/Greenshot.ImageEditor/Controls/SaveImageFileDialog.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/SaveImageFileDialog.cs
rename to Greenshot.ImageEditor/Controls/SaveImageFileDialog.cs
diff --git a/GreenshotImageEditor/Controls/ToolStripColorButton.cs b/Greenshot.ImageEditor/Controls/ToolStripColorButton.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/ToolStripColorButton.cs
rename to Greenshot.ImageEditor/Controls/ToolStripColorButton.cs
diff --git a/GreenshotImageEditor/Controls/ToolStripEx.cs b/Greenshot.ImageEditor/Controls/ToolStripEx.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/ToolStripEx.cs
rename to Greenshot.ImageEditor/Controls/ToolStripEx.cs
diff --git a/GreenshotImageEditor/Controls/ToolStripNumericUpDown.cs b/Greenshot.ImageEditor/Controls/ToolStripNumericUpDown.cs
similarity index 100%
rename from GreenshotImageEditor/Controls/ToolStripNumericUpDown.cs
rename to Greenshot.ImageEditor/Controls/ToolStripNumericUpDown.cs
diff --git a/GreenshotImageEditor/Core/BinaryStructHelper.cs b/Greenshot.ImageEditor/Core/BinaryStructHelper.cs
similarity index 100%
rename from GreenshotImageEditor/Core/BinaryStructHelper.cs
rename to Greenshot.ImageEditor/Core/BinaryStructHelper.cs
diff --git a/GreenshotImageEditor/Core/Cache.cs b/Greenshot.ImageEditor/Core/Cache.cs
similarity index 100%
rename from GreenshotImageEditor/Core/Cache.cs
rename to Greenshot.ImageEditor/Core/Cache.cs
diff --git a/GreenshotImageEditor/Core/ClipboardHelper.cs b/Greenshot.ImageEditor/Core/ClipboardHelper.cs
similarity index 100%
rename from GreenshotImageEditor/Core/ClipboardHelper.cs
rename to Greenshot.ImageEditor/Core/ClipboardHelper.cs
diff --git a/GreenshotImageEditor/Core/Effects.cs b/Greenshot.ImageEditor/Core/Effects.cs
similarity index 100%
rename from GreenshotImageEditor/Core/Effects.cs
rename to Greenshot.ImageEditor/Core/Effects.cs
diff --git a/GreenshotImageEditor/Core/EncryptionHelper.cs b/Greenshot.ImageEditor/Core/EncryptionHelper.cs
similarity index 100%
rename from GreenshotImageEditor/Core/EncryptionHelper.cs
rename to Greenshot.ImageEditor/Core/EncryptionHelper.cs
diff --git a/GreenshotImageEditor/Core/EnumExtensions.cs b/Greenshot.ImageEditor/Core/EnumExtensions.cs
similarity index 100%
rename from GreenshotImageEditor/Core/EnumExtensions.cs
rename to Greenshot.ImageEditor/Core/EnumExtensions.cs
diff --git a/GreenshotImageEditor/Core/FastBitmap.cs b/Greenshot.ImageEditor/Core/FastBitmap.cs
similarity index 100%
rename from GreenshotImageEditor/Core/FastBitmap.cs
rename to Greenshot.ImageEditor/Core/FastBitmap.cs
diff --git a/GreenshotImageEditor/Core/FilenameHelper.cs b/Greenshot.ImageEditor/Core/FilenameHelper.cs
similarity index 100%
rename from GreenshotImageEditor/Core/FilenameHelper.cs
rename to Greenshot.ImageEditor/Core/FilenameHelper.cs
diff --git a/GreenshotImageEditor/Core/GreenshotResources.cs b/Greenshot.ImageEditor/Core/GreenshotResources.cs
similarity index 100%
rename from GreenshotImageEditor/Core/GreenshotResources.cs
rename to Greenshot.ImageEditor/Core/GreenshotResources.cs
diff --git a/GreenshotImageEditor/Core/GreenshotResources.resx b/Greenshot.ImageEditor/Core/GreenshotResources.resx
similarity index 100%
rename from GreenshotImageEditor/Core/GreenshotResources.resx
rename to Greenshot.ImageEditor/Core/GreenshotResources.resx
diff --git a/GreenshotImageEditor/Core/ImageHelper.cs b/Greenshot.ImageEditor/Core/ImageHelper.cs
similarity index 100%
rename from GreenshotImageEditor/Core/ImageHelper.cs
rename to Greenshot.ImageEditor/Core/ImageHelper.cs
diff --git a/GreenshotImageEditor/Core/ImageOutput.cs b/Greenshot.ImageEditor/Core/ImageOutput.cs
similarity index 100%
rename from GreenshotImageEditor/Core/ImageOutput.cs
rename to Greenshot.ImageEditor/Core/ImageOutput.cs
diff --git a/GreenshotImageEditor/Core/Objects.cs b/Greenshot.ImageEditor/Core/Objects.cs
similarity index 100%
rename from GreenshotImageEditor/Core/Objects.cs
rename to Greenshot.ImageEditor/Core/Objects.cs
diff --git a/GreenshotImageEditor/Core/QuantizerHelper.cs b/Greenshot.ImageEditor/Core/QuantizerHelper.cs
similarity index 100%
rename from GreenshotImageEditor/Core/QuantizerHelper.cs
rename to Greenshot.ImageEditor/Core/QuantizerHelper.cs
diff --git a/GreenshotImageEditor/Core/WindowCapture.cs b/Greenshot.ImageEditor/Core/WindowCapture.cs
similarity index 100%
rename from GreenshotImageEditor/Core/WindowCapture.cs
rename to Greenshot.ImageEditor/Core/WindowCapture.cs
diff --git a/GreenshotImageEditor/Core/WindowsHelper.cs b/Greenshot.ImageEditor/Core/WindowsHelper.cs
similarity index 100%
rename from GreenshotImageEditor/Core/WindowsHelper.cs
rename to Greenshot.ImageEditor/Core/WindowsHelper.cs
diff --git a/GreenshotImageEditor/Drawing/ArrowContainer.cs b/Greenshot.ImageEditor/Drawing/ArrowContainer.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/ArrowContainer.cs
rename to Greenshot.ImageEditor/Drawing/ArrowContainer.cs
diff --git a/GreenshotImageEditor/Drawing/CropContainer.cs b/Greenshot.ImageEditor/Drawing/CropContainer.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/CropContainer.cs
rename to Greenshot.ImageEditor/Drawing/CropContainer.cs
diff --git a/GreenshotImageEditor/Drawing/CursorContainer.cs b/Greenshot.ImageEditor/Drawing/CursorContainer.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/CursorContainer.cs
rename to Greenshot.ImageEditor/Drawing/CursorContainer.cs
diff --git a/GreenshotImageEditor/Drawing/DrawableContainer.cs b/Greenshot.ImageEditor/Drawing/DrawableContainer.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/DrawableContainer.cs
rename to Greenshot.ImageEditor/Drawing/DrawableContainer.cs
diff --git a/GreenshotImageEditor/Drawing/DrawableContainerList.cs b/Greenshot.ImageEditor/Drawing/DrawableContainerList.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/DrawableContainerList.cs
rename to Greenshot.ImageEditor/Drawing/DrawableContainerList.cs
diff --git a/GreenshotImageEditor/Drawing/EllipseContainer.cs b/Greenshot.ImageEditor/Drawing/EllipseContainer.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/EllipseContainer.cs
rename to Greenshot.ImageEditor/Drawing/EllipseContainer.cs
diff --git a/GreenshotImageEditor/Drawing/Fields/AbstractFieldHolder.cs b/Greenshot.ImageEditor/Drawing/Fields/AbstractFieldHolder.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Fields/AbstractFieldHolder.cs
rename to Greenshot.ImageEditor/Drawing/Fields/AbstractFieldHolder.cs
diff --git a/GreenshotImageEditor/Drawing/Fields/AbstractFieldHolderWithChildren.cs b/Greenshot.ImageEditor/Drawing/Fields/AbstractFieldHolderWithChildren.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Fields/AbstractFieldHolderWithChildren.cs
rename to Greenshot.ImageEditor/Drawing/Fields/AbstractFieldHolderWithChildren.cs
diff --git a/GreenshotImageEditor/Drawing/Fields/Binding/AbstractBindingConverter.cs b/Greenshot.ImageEditor/Drawing/Fields/Binding/AbstractBindingConverter.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Fields/Binding/AbstractBindingConverter.cs
rename to Greenshot.ImageEditor/Drawing/Fields/Binding/AbstractBindingConverter.cs
diff --git a/GreenshotImageEditor/Drawing/Fields/Binding/AlignmentConverter.cs b/Greenshot.ImageEditor/Drawing/Fields/Binding/AlignmentConverter.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Fields/Binding/AlignmentConverter.cs
rename to Greenshot.ImageEditor/Drawing/Fields/Binding/AlignmentConverter.cs
diff --git a/GreenshotImageEditor/Drawing/Fields/Binding/BidirectionalBinding.cs b/Greenshot.ImageEditor/Drawing/Fields/Binding/BidirectionalBinding.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Fields/Binding/BidirectionalBinding.cs
rename to Greenshot.ImageEditor/Drawing/Fields/Binding/BidirectionalBinding.cs
diff --git a/GreenshotImageEditor/Drawing/Fields/Binding/DecimalDoublePercentageConverter.cs b/Greenshot.ImageEditor/Drawing/Fields/Binding/DecimalDoublePercentageConverter.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Fields/Binding/DecimalDoublePercentageConverter.cs
rename to Greenshot.ImageEditor/Drawing/Fields/Binding/DecimalDoublePercentageConverter.cs
diff --git a/GreenshotImageEditor/Drawing/Fields/Binding/DecimalFloatConverter.cs b/Greenshot.ImageEditor/Drawing/Fields/Binding/DecimalFloatConverter.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Fields/Binding/DecimalFloatConverter.cs
rename to Greenshot.ImageEditor/Drawing/Fields/Binding/DecimalFloatConverter.cs
diff --git a/GreenshotImageEditor/Drawing/Fields/Binding/DecimalIntConverter.cs b/Greenshot.ImageEditor/Drawing/Fields/Binding/DecimalIntConverter.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Fields/Binding/DecimalIntConverter.cs
rename to Greenshot.ImageEditor/Drawing/Fields/Binding/DecimalIntConverter.cs
diff --git a/GreenshotImageEditor/Drawing/Fields/Binding/IBindingConverter.cs b/Greenshot.ImageEditor/Drawing/Fields/Binding/IBindingConverter.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Fields/Binding/IBindingConverter.cs
rename to Greenshot.ImageEditor/Drawing/Fields/Binding/IBindingConverter.cs
diff --git a/GreenshotImageEditor/Drawing/Fields/Binding/IBindingValidator.cs b/Greenshot.ImageEditor/Drawing/Fields/Binding/IBindingValidator.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Fields/Binding/IBindingValidator.cs
rename to Greenshot.ImageEditor/Drawing/Fields/Binding/IBindingValidator.cs
diff --git a/GreenshotImageEditor/Drawing/Fields/Binding/NotNullValidator.cs b/Greenshot.ImageEditor/Drawing/Fields/Binding/NotNullValidator.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Fields/Binding/NotNullValidator.cs
rename to Greenshot.ImageEditor/Drawing/Fields/Binding/NotNullValidator.cs
diff --git a/GreenshotImageEditor/Drawing/Fields/Field.cs b/Greenshot.ImageEditor/Drawing/Fields/Field.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Fields/Field.cs
rename to Greenshot.ImageEditor/Drawing/Fields/Field.cs
diff --git a/GreenshotImageEditor/Drawing/Fields/FieldAggregator.cs b/Greenshot.ImageEditor/Drawing/Fields/FieldAggregator.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Fields/FieldAggregator.cs
rename to Greenshot.ImageEditor/Drawing/Fields/FieldAggregator.cs
diff --git a/GreenshotImageEditor/Drawing/Fields/FieldType.cs b/Greenshot.ImageEditor/Drawing/Fields/FieldType.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Fields/FieldType.cs
rename to Greenshot.ImageEditor/Drawing/Fields/FieldType.cs
diff --git a/GreenshotImageEditor/Drawing/Fields/IFieldHolder.cs b/Greenshot.ImageEditor/Drawing/Fields/IFieldHolder.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Fields/IFieldHolder.cs
rename to Greenshot.ImageEditor/Drawing/Fields/IFieldHolder.cs
diff --git a/GreenshotImageEditor/Drawing/FilterContainer.cs b/Greenshot.ImageEditor/Drawing/FilterContainer.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/FilterContainer.cs
rename to Greenshot.ImageEditor/Drawing/FilterContainer.cs
diff --git a/GreenshotImageEditor/Drawing/Filters/AbstractFilter.cs b/Greenshot.ImageEditor/Drawing/Filters/AbstractFilter.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Filters/AbstractFilter.cs
rename to Greenshot.ImageEditor/Drawing/Filters/AbstractFilter.cs
diff --git a/GreenshotImageEditor/Drawing/Filters/BlurFilter.cs b/Greenshot.ImageEditor/Drawing/Filters/BlurFilter.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Filters/BlurFilter.cs
rename to Greenshot.ImageEditor/Drawing/Filters/BlurFilter.cs
diff --git a/GreenshotImageEditor/Drawing/Filters/BrightnessFilter.cs b/Greenshot.ImageEditor/Drawing/Filters/BrightnessFilter.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Filters/BrightnessFilter.cs
rename to Greenshot.ImageEditor/Drawing/Filters/BrightnessFilter.cs
diff --git a/GreenshotImageEditor/Drawing/Filters/GrayscaleFilter.cs b/Greenshot.ImageEditor/Drawing/Filters/GrayscaleFilter.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Filters/GrayscaleFilter.cs
rename to Greenshot.ImageEditor/Drawing/Filters/GrayscaleFilter.cs
diff --git a/GreenshotImageEditor/Drawing/Filters/HighlightFilter.cs b/Greenshot.ImageEditor/Drawing/Filters/HighlightFilter.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Filters/HighlightFilter.cs
rename to Greenshot.ImageEditor/Drawing/Filters/HighlightFilter.cs
diff --git a/GreenshotImageEditor/Drawing/Filters/IFilter.cs b/Greenshot.ImageEditor/Drawing/Filters/IFilter.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Filters/IFilter.cs
rename to Greenshot.ImageEditor/Drawing/Filters/IFilter.cs
diff --git a/GreenshotImageEditor/Drawing/Filters/MagnifierFilter.cs b/Greenshot.ImageEditor/Drawing/Filters/MagnifierFilter.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Filters/MagnifierFilter.cs
rename to Greenshot.ImageEditor/Drawing/Filters/MagnifierFilter.cs
diff --git a/GreenshotImageEditor/Drawing/Filters/PixelizationFilter.cs b/Greenshot.ImageEditor/Drawing/Filters/PixelizationFilter.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Filters/PixelizationFilter.cs
rename to Greenshot.ImageEditor/Drawing/Filters/PixelizationFilter.cs
diff --git a/GreenshotImageEditor/Drawing/FreehandContainer.cs b/Greenshot.ImageEditor/Drawing/FreehandContainer.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/FreehandContainer.cs
rename to Greenshot.ImageEditor/Drawing/FreehandContainer.cs
diff --git a/GreenshotImageEditor/Drawing/Gripper.cs b/Greenshot.ImageEditor/Drawing/Gripper.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Gripper.cs
rename to Greenshot.ImageEditor/Drawing/Gripper.cs
diff --git a/GreenshotImageEditor/Drawing/HighlightContainer.cs b/Greenshot.ImageEditor/Drawing/HighlightContainer.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/HighlightContainer.cs
rename to Greenshot.ImageEditor/Drawing/HighlightContainer.cs
diff --git a/GreenshotImageEditor/Drawing/IconContainer.cs b/Greenshot.ImageEditor/Drawing/IconContainer.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/IconContainer.cs
rename to Greenshot.ImageEditor/Drawing/IconContainer.cs
diff --git a/GreenshotImageEditor/Drawing/ImageContainer.cs b/Greenshot.ImageEditor/Drawing/ImageContainer.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/ImageContainer.cs
rename to Greenshot.ImageEditor/Drawing/ImageContainer.cs
diff --git a/GreenshotImageEditor/Drawing/LineContainer.cs b/Greenshot.ImageEditor/Drawing/LineContainer.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/LineContainer.cs
rename to Greenshot.ImageEditor/Drawing/LineContainer.cs
diff --git a/GreenshotImageEditor/Drawing/ObfuscateContainer.cs b/Greenshot.ImageEditor/Drawing/ObfuscateContainer.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/ObfuscateContainer.cs
rename to Greenshot.ImageEditor/Drawing/ObfuscateContainer.cs
diff --git a/GreenshotImageEditor/Drawing/RectangleContainer.cs b/Greenshot.ImageEditor/Drawing/RectangleContainer.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/RectangleContainer.cs
rename to Greenshot.ImageEditor/Drawing/RectangleContainer.cs
diff --git a/GreenshotImageEditor/Drawing/SpeechbubbleContainer.cs b/Greenshot.ImageEditor/Drawing/SpeechbubbleContainer.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/SpeechbubbleContainer.cs
rename to Greenshot.ImageEditor/Drawing/SpeechbubbleContainer.cs
diff --git a/GreenshotImageEditor/Drawing/StepLabelContainer.cs b/Greenshot.ImageEditor/Drawing/StepLabelContainer.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/StepLabelContainer.cs
rename to Greenshot.ImageEditor/Drawing/StepLabelContainer.cs
diff --git a/GreenshotImageEditor/Drawing/Surface.cs b/Greenshot.ImageEditor/Drawing/Surface.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/Surface.cs
rename to Greenshot.ImageEditor/Drawing/Surface.cs
diff --git a/GreenshotImageEditor/Drawing/TextContainer.cs b/Greenshot.ImageEditor/Drawing/TextContainer.cs
similarity index 100%
rename from GreenshotImageEditor/Drawing/TextContainer.cs
rename to Greenshot.ImageEditor/Drawing/TextContainer.cs
diff --git a/GreenshotImageEditor/Forms/AboutForm.Designer.cs b/Greenshot.ImageEditor/Forms/AboutForm.Designer.cs
similarity index 100%
rename from GreenshotImageEditor/Forms/AboutForm.Designer.cs
rename to Greenshot.ImageEditor/Forms/AboutForm.Designer.cs
diff --git a/GreenshotImageEditor/Forms/AboutForm.cs b/Greenshot.ImageEditor/Forms/AboutForm.cs
similarity index 100%
rename from GreenshotImageEditor/Forms/AboutForm.cs
rename to Greenshot.ImageEditor/Forms/AboutForm.cs
diff --git a/GreenshotImageEditor/Forms/BaseForm.cs b/Greenshot.ImageEditor/Forms/BaseForm.cs
similarity index 100%
rename from GreenshotImageEditor/Forms/BaseForm.cs
rename to Greenshot.ImageEditor/Forms/BaseForm.cs
diff --git a/GreenshotImageEditor/Forms/ColorDialog.Designer.cs b/Greenshot.ImageEditor/Forms/ColorDialog.Designer.cs
similarity index 100%
rename from GreenshotImageEditor/Forms/ColorDialog.Designer.cs
rename to Greenshot.ImageEditor/Forms/ColorDialog.Designer.cs
diff --git a/GreenshotImageEditor/Forms/ColorDialog.cs b/Greenshot.ImageEditor/Forms/ColorDialog.cs
similarity index 100%
rename from GreenshotImageEditor/Forms/ColorDialog.cs
rename to Greenshot.ImageEditor/Forms/ColorDialog.cs
diff --git a/GreenshotImageEditor/Forms/ColorDialog.resx b/Greenshot.ImageEditor/Forms/ColorDialog.resx
similarity index 100%
rename from GreenshotImageEditor/Forms/ColorDialog.resx
rename to Greenshot.ImageEditor/Forms/ColorDialog.resx
diff --git a/GreenshotImageEditor/Forms/ColorPickerToolStripButton.cs b/Greenshot.ImageEditor/Forms/ColorPickerToolStripButton.cs
similarity index 100%
rename from GreenshotImageEditor/Forms/ColorPickerToolStripButton.cs
rename to Greenshot.ImageEditor/Forms/ColorPickerToolStripButton.cs
diff --git a/GreenshotImageEditor/Forms/DropShadowSettingsForm.Designer.cs b/Greenshot.ImageEditor/Forms/DropShadowSettingsForm.Designer.cs
similarity index 100%
rename from GreenshotImageEditor/Forms/DropShadowSettingsForm.Designer.cs
rename to Greenshot.ImageEditor/Forms/DropShadowSettingsForm.Designer.cs
diff --git a/GreenshotImageEditor/Forms/DropShadowSettingsForm.cs b/Greenshot.ImageEditor/Forms/DropShadowSettingsForm.cs
similarity index 100%
rename from GreenshotImageEditor/Forms/DropShadowSettingsForm.cs
rename to Greenshot.ImageEditor/Forms/DropShadowSettingsForm.cs
diff --git a/GreenshotImageEditor/Forms/ImageEditorForm.Designer.cs b/Greenshot.ImageEditor/Forms/ImageEditorForm.Designer.cs
similarity index 100%
rename from GreenshotImageEditor/Forms/ImageEditorForm.Designer.cs
rename to Greenshot.ImageEditor/Forms/ImageEditorForm.Designer.cs
diff --git a/GreenshotImageEditor/Forms/ImageEditorForm.cs b/Greenshot.ImageEditor/Forms/ImageEditorForm.cs
similarity index 100%
rename from GreenshotImageEditor/Forms/ImageEditorForm.cs
rename to Greenshot.ImageEditor/Forms/ImageEditorForm.cs
diff --git a/GreenshotImageEditor/Forms/ImageEditorForm.resx b/Greenshot.ImageEditor/Forms/ImageEditorForm.resx
similarity index 100%
rename from GreenshotImageEditor/Forms/ImageEditorForm.resx
rename to Greenshot.ImageEditor/Forms/ImageEditorForm.resx
diff --git a/GreenshotImageEditor/Forms/MovableShowColorForm.Designer.cs b/Greenshot.ImageEditor/Forms/MovableShowColorForm.Designer.cs
similarity index 100%
rename from GreenshotImageEditor/Forms/MovableShowColorForm.Designer.cs
rename to Greenshot.ImageEditor/Forms/MovableShowColorForm.Designer.cs
diff --git a/GreenshotImageEditor/Forms/MovableShowColorForm.cs b/Greenshot.ImageEditor/Forms/MovableShowColorForm.cs
similarity index 100%
rename from GreenshotImageEditor/Forms/MovableShowColorForm.cs
rename to Greenshot.ImageEditor/Forms/MovableShowColorForm.cs
diff --git a/GreenshotImageEditor/Forms/ResizeSettingsForm.Designer.cs b/Greenshot.ImageEditor/Forms/ResizeSettingsForm.Designer.cs
similarity index 100%
rename from GreenshotImageEditor/Forms/ResizeSettingsForm.Designer.cs
rename to Greenshot.ImageEditor/Forms/ResizeSettingsForm.Designer.cs
diff --git a/GreenshotImageEditor/Forms/ResizeSettingsForm.cs b/Greenshot.ImageEditor/Forms/ResizeSettingsForm.cs
similarity index 100%
rename from GreenshotImageEditor/Forms/ResizeSettingsForm.cs
rename to Greenshot.ImageEditor/Forms/ResizeSettingsForm.cs
diff --git a/GreenshotImageEditor/Forms/TornEdgeSettingsForm.Designer.cs b/Greenshot.ImageEditor/Forms/TornEdgeSettingsForm.Designer.cs
similarity index 100%
rename from GreenshotImageEditor/Forms/TornEdgeSettingsForm.Designer.cs
rename to Greenshot.ImageEditor/Forms/TornEdgeSettingsForm.Designer.cs
diff --git a/GreenshotImageEditor/Forms/TornEdgeSettingsForm.cs b/Greenshot.ImageEditor/Forms/TornEdgeSettingsForm.cs
similarity index 100%
rename from GreenshotImageEditor/Forms/TornEdgeSettingsForm.cs
rename to Greenshot.ImageEditor/Forms/TornEdgeSettingsForm.cs
diff --git a/GreenshotImageEditor/GreenshotImageEditor.csproj b/Greenshot.ImageEditor/Greenshot.ImageEditor.csproj
similarity index 99%
rename from GreenshotImageEditor/GreenshotImageEditor.csproj
rename to Greenshot.ImageEditor/Greenshot.ImageEditor.csproj
index 7e9d42c1f..4a3507e1b 100644
--- a/GreenshotImageEditor/GreenshotImageEditor.csproj
+++ b/Greenshot.ImageEditor/Greenshot.ImageEditor.csproj
@@ -4,7 +4,7 @@
     <ProjectGuid>{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>Greenshot</RootNamespace>
-    <AssemblyName>GreenshotImageEditor</AssemblyName>
+    <AssemblyName>Greenshot.ImageEditor</AssemblyName>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <ApplicationIcon>
     </ApplicationIcon>
diff --git a/GreenshotImageEditor/Helpers/Colors.cs b/Greenshot.ImageEditor/Helpers/Colors.cs
similarity index 100%
rename from GreenshotImageEditor/Helpers/Colors.cs
rename to Greenshot.ImageEditor/Helpers/Colors.cs
diff --git a/GreenshotImageEditor/Helpers/GeometryHelper.cs b/Greenshot.ImageEditor/Helpers/GeometryHelper.cs
similarity index 100%
rename from GreenshotImageEditor/Helpers/GeometryHelper.cs
rename to Greenshot.ImageEditor/Helpers/GeometryHelper.cs
diff --git a/GreenshotImageEditor/Helpers/GuiRectangle.cs b/Greenshot.ImageEditor/Helpers/GuiRectangle.cs
similarity index 100%
rename from GreenshotImageEditor/Helpers/GuiRectangle.cs
rename to Greenshot.ImageEditor/Helpers/GuiRectangle.cs
diff --git a/GreenshotImageEditor/Helpers/LOG.cs b/Greenshot.ImageEditor/Helpers/LOG.cs
similarity index 100%
rename from GreenshotImageEditor/Helpers/LOG.cs
rename to Greenshot.ImageEditor/Helpers/LOG.cs
diff --git a/GreenshotImageEditor/Helpers/LogHelper.cs b/Greenshot.ImageEditor/Helpers/LogHelper.cs
similarity index 100%
rename from GreenshotImageEditor/Helpers/LogHelper.cs
rename to Greenshot.ImageEditor/Helpers/LogHelper.cs
diff --git a/GreenshotImageEditor/Helpers/ScaleHelper.cs b/Greenshot.ImageEditor/Helpers/ScaleHelper.cs
similarity index 100%
rename from GreenshotImageEditor/Helpers/ScaleHelper.cs
rename to Greenshot.ImageEditor/Helpers/ScaleHelper.cs
diff --git a/GreenshotImageEditor/Helpers/ToolStripItemEndisabler.cs b/Greenshot.ImageEditor/Helpers/ToolStripItemEndisabler.cs
similarity index 100%
rename from GreenshotImageEditor/Helpers/ToolStripItemEndisabler.cs
rename to Greenshot.ImageEditor/Helpers/ToolStripItemEndisabler.cs
diff --git a/GreenshotImageEditor/icons/applicationIcon/16.ico b/Greenshot.ImageEditor/Icons/applicationIcon/16.ico
similarity index 100%
rename from GreenshotImageEditor/icons/applicationIcon/16.ico
rename to Greenshot.ImageEditor/Icons/applicationIcon/16.ico
diff --git a/GreenshotImageEditor/icons/applicationIcon/16.png b/Greenshot.ImageEditor/Icons/applicationIcon/16.png
similarity index 100%
rename from GreenshotImageEditor/icons/applicationIcon/16.png
rename to Greenshot.ImageEditor/Icons/applicationIcon/16.png
diff --git a/GreenshotImageEditor/icons/applicationIcon/32.ico b/Greenshot.ImageEditor/Icons/applicationIcon/32.ico
similarity index 100%
rename from GreenshotImageEditor/icons/applicationIcon/32.ico
rename to Greenshot.ImageEditor/Icons/applicationIcon/32.ico
diff --git a/GreenshotImageEditor/icons/applicationIcon/32.png b/Greenshot.ImageEditor/Icons/applicationIcon/32.png
similarity index 100%
rename from GreenshotImageEditor/icons/applicationIcon/32.png
rename to Greenshot.ImageEditor/Icons/applicationIcon/32.png
diff --git a/GreenshotImageEditor/icons/applicationIcon/48.ico b/Greenshot.ImageEditor/Icons/applicationIcon/48.ico
similarity index 100%
rename from GreenshotImageEditor/icons/applicationIcon/48.ico
rename to Greenshot.ImageEditor/Icons/applicationIcon/48.ico
diff --git a/GreenshotImageEditor/icons/applicationIcon/48.png b/Greenshot.ImageEditor/Icons/applicationIcon/48.png
similarity index 100%
rename from GreenshotImageEditor/icons/applicationIcon/48.png
rename to Greenshot.ImageEditor/Icons/applicationIcon/48.png
diff --git a/GreenshotImageEditor/icons/applicationIcon/90.png b/Greenshot.ImageEditor/Icons/applicationIcon/90.png
similarity index 100%
rename from GreenshotImageEditor/icons/applicationIcon/90.png
rename to Greenshot.ImageEditor/Icons/applicationIcon/90.png
diff --git a/GreenshotImageEditor/icons/applicationIcon/icon.ico b/Greenshot.ImageEditor/Icons/applicationIcon/icon.ico
similarity index 100%
rename from GreenshotImageEditor/icons/applicationIcon/icon.ico
rename to Greenshot.ImageEditor/Icons/applicationIcon/icon.ico
diff --git a/GreenshotImageEditor/icons/arrow_redo.png b/Greenshot.ImageEditor/Icons/arrow_redo.png
similarity index 100%
rename from GreenshotImageEditor/icons/arrow_redo.png
rename to Greenshot.ImageEditor/Icons/arrow_redo.png
diff --git a/GreenshotImageEditor/icons/arrow_rollback.png b/Greenshot.ImageEditor/Icons/arrow_rollback.png
similarity index 100%
rename from GreenshotImageEditor/icons/arrow_rollback.png
rename to Greenshot.ImageEditor/Icons/arrow_rollback.png
diff --git a/GreenshotImageEditor/icons/arrow_undo.png b/Greenshot.ImageEditor/Icons/arrow_undo.png
similarity index 100%
rename from GreenshotImageEditor/icons/arrow_undo.png
rename to Greenshot.ImageEditor/Icons/arrow_undo.png
diff --git a/GreenshotImageEditor/icons/balloon.png b/Greenshot.ImageEditor/Icons/balloon.png
similarity index 100%
rename from GreenshotImageEditor/icons/balloon.png
rename to Greenshot.ImageEditor/Icons/balloon.png
diff --git a/GreenshotImageEditor/icons/cancel.png b/Greenshot.ImageEditor/Icons/cancel.png
similarity index 100%
rename from GreenshotImageEditor/icons/cancel.png
rename to Greenshot.ImageEditor/Icons/cancel.png
diff --git a/GreenshotImageEditor/icons/cross.png b/Greenshot.ImageEditor/Icons/cross.png
similarity index 100%
rename from GreenshotImageEditor/icons/cross.png
rename to Greenshot.ImageEditor/Icons/cross.png
diff --git a/GreenshotImageEditor/icons/cut.png b/Greenshot.ImageEditor/Icons/cut.png
similarity index 100%
rename from GreenshotImageEditor/icons/cut.png
rename to Greenshot.ImageEditor/Icons/cut.png
diff --git a/GreenshotImageEditor/icons/delete.png b/Greenshot.ImageEditor/Icons/delete.png
similarity index 100%
rename from GreenshotImageEditor/icons/delete.png
rename to Greenshot.ImageEditor/Icons/delete.png
diff --git a/GreenshotImageEditor/icons/disk-black.png b/Greenshot.ImageEditor/Icons/disk-black.png
similarity index 100%
rename from GreenshotImageEditor/icons/disk-black.png
rename to Greenshot.ImageEditor/Icons/disk-black.png
diff --git a/GreenshotImageEditor/icons/filter_blur.png b/Greenshot.ImageEditor/Icons/filter_blur.png
similarity index 100%
rename from GreenshotImageEditor/icons/filter_blur.png
rename to Greenshot.ImageEditor/Icons/filter_blur.png
diff --git a/GreenshotImageEditor/icons/filter_pixelate.png b/Greenshot.ImageEditor/Icons/filter_pixelate.png
similarity index 100%
rename from GreenshotImageEditor/icons/filter_pixelate.png
rename to Greenshot.ImageEditor/Icons/filter_pixelate.png
diff --git a/GreenshotImageEditor/icons/folder-open-image.png b/Greenshot.ImageEditor/Icons/folder-open-image.png
similarity index 100%
rename from GreenshotImageEditor/icons/folder-open-image.png
rename to Greenshot.ImageEditor/Icons/folder-open-image.png
diff --git a/GreenshotImageEditor/icons/folder_explore.png b/Greenshot.ImageEditor/Icons/folder_explore.png
similarity index 100%
rename from GreenshotImageEditor/icons/folder_explore.png
rename to Greenshot.ImageEditor/Icons/folder_explore.png
diff --git a/GreenshotImageEditor/icons/font_color.png b/Greenshot.ImageEditor/Icons/font_color.png
similarity index 100%
rename from GreenshotImageEditor/icons/font_color.png
rename to Greenshot.ImageEditor/Icons/font_color.png
diff --git a/GreenshotImageEditor/icons/freehand.png b/Greenshot.ImageEditor/Icons/freehand.png
similarity index 100%
rename from GreenshotImageEditor/icons/freehand.png
rename to Greenshot.ImageEditor/Icons/freehand.png
diff --git a/GreenshotImageEditor/icons/fugue/arrow-resize.png b/Greenshot.ImageEditor/Icons/fugue/arrow-resize.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/arrow-resize.png
rename to Greenshot.ImageEditor/Icons/fugue/arrow-resize.png
diff --git a/GreenshotImageEditor/icons/fugue/clipboard-paste-image.png b/Greenshot.ImageEditor/Icons/fugue/clipboard-paste-image.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/clipboard-paste-image.png
rename to Greenshot.ImageEditor/Icons/fugue/clipboard-paste-image.png
diff --git a/GreenshotImageEditor/icons/fugue/clipboard.png b/Greenshot.ImageEditor/Icons/fugue/clipboard.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/clipboard.png
rename to Greenshot.ImageEditor/Icons/fugue/clipboard.png
diff --git a/GreenshotImageEditor/icons/fugue/color-swatch.png b/Greenshot.ImageEditor/Icons/fugue/color-swatch.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/color-swatch.png
rename to Greenshot.ImageEditor/Icons/fugue/color-swatch.png
diff --git a/GreenshotImageEditor/icons/fugue/cross.png b/Greenshot.ImageEditor/Icons/fugue/cross.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/cross.png
rename to Greenshot.ImageEditor/Icons/fugue/cross.png
diff --git a/GreenshotImageEditor/icons/fugue/cursor.png b/Greenshot.ImageEditor/Icons/fugue/cursor.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/cursor.png
rename to Greenshot.ImageEditor/Icons/fugue/cursor.png
diff --git a/GreenshotImageEditor/icons/fugue/disk-black.png b/Greenshot.ImageEditor/Icons/fugue/disk-black.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/disk-black.png
rename to Greenshot.ImageEditor/Icons/fugue/disk-black.png
diff --git a/GreenshotImageEditor/icons/fugue/disks-black.png b/Greenshot.ImageEditor/Icons/fugue/disks-black.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/disks-black.png
rename to Greenshot.ImageEditor/Icons/fugue/disks-black.png
diff --git a/GreenshotImageEditor/icons/fugue/drive-globe.png b/Greenshot.ImageEditor/Icons/fugue/drive-globe.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/drive-globe.png
rename to Greenshot.ImageEditor/Icons/fugue/drive-globe.png
diff --git a/GreenshotImageEditor/icons/fugue/edit-alignment-center.png b/Greenshot.ImageEditor/Icons/fugue/edit-alignment-center.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/edit-alignment-center.png
rename to Greenshot.ImageEditor/Icons/fugue/edit-alignment-center.png
diff --git a/GreenshotImageEditor/icons/fugue/edit-alignment-right.png b/Greenshot.ImageEditor/Icons/fugue/edit-alignment-right.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/edit-alignment-right.png
rename to Greenshot.ImageEditor/Icons/fugue/edit-alignment-right.png
diff --git a/GreenshotImageEditor/icons/fugue/edit-alignment.png b/Greenshot.ImageEditor/Icons/fugue/edit-alignment.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/edit-alignment.png
rename to Greenshot.ImageEditor/Icons/fugue/edit-alignment.png
diff --git a/GreenshotImageEditor/icons/fugue/edit-blur.png b/Greenshot.ImageEditor/Icons/fugue/edit-blur.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/edit-blur.png
rename to Greenshot.ImageEditor/Icons/fugue/edit-blur.png
diff --git a/GreenshotImageEditor/icons/fugue/edit-bold.png b/Greenshot.ImageEditor/Icons/fugue/edit-bold.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/edit-bold.png
rename to Greenshot.ImageEditor/Icons/fugue/edit-bold.png
diff --git a/GreenshotImageEditor/icons/fugue/edit-italic.png b/Greenshot.ImageEditor/Icons/fugue/edit-italic.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/edit-italic.png
rename to Greenshot.ImageEditor/Icons/fugue/edit-italic.png
diff --git a/GreenshotImageEditor/icons/fugue/edit-pixelate.png b/Greenshot.ImageEditor/Icons/fugue/edit-pixelate.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/edit-pixelate.png
rename to Greenshot.ImageEditor/Icons/fugue/edit-pixelate.png
diff --git a/GreenshotImageEditor/icons/fugue/edit-underline.png b/Greenshot.ImageEditor/Icons/fugue/edit-underline.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/edit-underline.png
rename to Greenshot.ImageEditor/Icons/fugue/edit-underline.png
diff --git a/GreenshotImageEditor/icons/fugue/edit-vertical-alignment-middle.png b/Greenshot.ImageEditor/Icons/fugue/edit-vertical-alignment-middle.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/edit-vertical-alignment-middle.png
rename to Greenshot.ImageEditor/Icons/fugue/edit-vertical-alignment-middle.png
diff --git a/GreenshotImageEditor/icons/fugue/edit-vertical-alignment-top.png b/Greenshot.ImageEditor/Icons/fugue/edit-vertical-alignment-top.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/edit-vertical-alignment-top.png
rename to Greenshot.ImageEditor/Icons/fugue/edit-vertical-alignment-top.png
diff --git a/GreenshotImageEditor/icons/fugue/edit-vertical-alignment.png b/Greenshot.ImageEditor/Icons/fugue/edit-vertical-alignment.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/edit-vertical-alignment.png
rename to Greenshot.ImageEditor/Icons/fugue/edit-vertical-alignment.png
diff --git a/GreenshotImageEditor/icons/fugue/filter_base.pdn b/Greenshot.ImageEditor/Icons/fugue/filter_base.pdn
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/filter_base.pdn
rename to Greenshot.ImageEditor/Icons/fugue/filter_base.pdn
diff --git a/GreenshotImageEditor/icons/fugue/filter_highlight_area.png b/Greenshot.ImageEditor/Icons/fugue/filter_highlight_area.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/filter_highlight_area.png
rename to Greenshot.ImageEditor/Icons/fugue/filter_highlight_area.png
diff --git a/GreenshotImageEditor/icons/fugue/filter_highlight_grayscale.png b/Greenshot.ImageEditor/Icons/fugue/filter_highlight_grayscale.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/filter_highlight_grayscale.png
rename to Greenshot.ImageEditor/Icons/fugue/filter_highlight_grayscale.png
diff --git a/GreenshotImageEditor/icons/fugue/filter_highlight_text.png b/Greenshot.ImageEditor/Icons/fugue/filter_highlight_text.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/filter_highlight_text.png
rename to Greenshot.ImageEditor/Icons/fugue/filter_highlight_text.png
diff --git a/GreenshotImageEditor/icons/fugue/gear.png b/Greenshot.ImageEditor/Icons/fugue/gear.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/gear.png
rename to Greenshot.ImageEditor/Icons/fugue/gear.png
diff --git a/GreenshotImageEditor/icons/fugue/highlighter-color.png b/Greenshot.ImageEditor/Icons/fugue/highlighter-color.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/highlighter-color.png
rename to Greenshot.ImageEditor/Icons/fugue/highlighter-color.png
diff --git a/GreenshotImageEditor/icons/fugue/highlighter-text.png b/Greenshot.ImageEditor/Icons/fugue/highlighter-text.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/highlighter-text.png
rename to Greenshot.ImageEditor/Icons/fugue/highlighter-text.png
diff --git a/GreenshotImageEditor/icons/fugue/image-blur.png b/Greenshot.ImageEditor/Icons/fugue/image-blur.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/image-blur.png
rename to Greenshot.ImageEditor/Icons/fugue/image-blur.png
diff --git a/GreenshotImageEditor/icons/fugue/image-pixelate.png b/Greenshot.ImageEditor/Icons/fugue/image-pixelate.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/image-pixelate.png
rename to Greenshot.ImageEditor/Icons/fugue/image-pixelate.png
diff --git a/GreenshotImageEditor/icons/fugue/images.png b/Greenshot.ImageEditor/Icons/fugue/images.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/images.png
rename to Greenshot.ImageEditor/Icons/fugue/images.png
diff --git a/GreenshotImageEditor/icons/fugue/layer-shape-arrow.png b/Greenshot.ImageEditor/Icons/fugue/layer-shape-arrow.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/layer-shape-arrow.png
rename to Greenshot.ImageEditor/Icons/fugue/layer-shape-arrow.png
diff --git a/GreenshotImageEditor/icons/fugue/layer-shape-ellipse.png b/Greenshot.ImageEditor/Icons/fugue/layer-shape-ellipse.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/layer-shape-ellipse.png
rename to Greenshot.ImageEditor/Icons/fugue/layer-shape-ellipse.png
diff --git a/GreenshotImageEditor/icons/fugue/layer-shape-line.png b/Greenshot.ImageEditor/Icons/fugue/layer-shape-line.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/layer-shape-line.png
rename to Greenshot.ImageEditor/Icons/fugue/layer-shape-line.png
diff --git a/GreenshotImageEditor/icons/fugue/layer-shape-text.png b/Greenshot.ImageEditor/Icons/fugue/layer-shape-text.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/layer-shape-text.png
rename to Greenshot.ImageEditor/Icons/fugue/layer-shape-text.png
diff --git a/GreenshotImageEditor/icons/fugue/layer-shape.png b/Greenshot.ImageEditor/Icons/fugue/layer-shape.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/layer-shape.png
rename to Greenshot.ImageEditor/Icons/fugue/layer-shape.png
diff --git a/GreenshotImageEditor/icons/fugue/magnifier.png b/Greenshot.ImageEditor/Icons/fugue/magnifier.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/magnifier.png
rename to Greenshot.ImageEditor/Icons/fugue/magnifier.png
diff --git a/GreenshotImageEditor/icons/fugue/mail-open-image.png b/Greenshot.ImageEditor/Icons/fugue/mail-open-image.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/mail-open-image.png
rename to Greenshot.ImageEditor/Icons/fugue/mail-open-image.png
diff --git a/GreenshotImageEditor/icons/fugue/minus-circle.png b/Greenshot.ImageEditor/Icons/fugue/minus-circle.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/minus-circle.png
rename to Greenshot.ImageEditor/Icons/fugue/minus-circle.png
diff --git a/GreenshotImageEditor/icons/fugue/money-coin.png b/Greenshot.ImageEditor/Icons/fugue/money-coin.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/money-coin.png
rename to Greenshot.ImageEditor/Icons/fugue/money-coin.png
diff --git a/GreenshotImageEditor/icons/fugue/paint-can-color-bg.png b/Greenshot.ImageEditor/Icons/fugue/paint-can-color-bg.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/paint-can-color-bg.png
rename to Greenshot.ImageEditor/Icons/fugue/paint-can-color-bg.png
diff --git a/GreenshotImageEditor/icons/fugue/paint-can-color.png b/Greenshot.ImageEditor/Icons/fugue/paint-can-color.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/paint-can-color.png
rename to Greenshot.ImageEditor/Icons/fugue/paint-can-color.png
diff --git a/GreenshotImageEditor/icons/fugue/pencil-color-bg.png b/Greenshot.ImageEditor/Icons/fugue/pencil-color-bg.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/pencil-color-bg.png
rename to Greenshot.ImageEditor/Icons/fugue/pencil-color-bg.png
diff --git a/GreenshotImageEditor/icons/fugue/pencil-color.png b/Greenshot.ImageEditor/Icons/fugue/pencil-color.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/pencil-color.png
rename to Greenshot.ImageEditor/Icons/fugue/pencil-color.png
diff --git a/GreenshotImageEditor/icons/fugue/printer.png b/Greenshot.ImageEditor/Icons/fugue/printer.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/printer.png
rename to Greenshot.ImageEditor/Icons/fugue/printer.png
diff --git a/GreenshotImageEditor/icons/fugue/question.png b/Greenshot.ImageEditor/Icons/fugue/question.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/question.png
rename to Greenshot.ImageEditor/Icons/fugue/question.png
diff --git a/GreenshotImageEditor/icons/fugue/ruler-crop.png b/Greenshot.ImageEditor/Icons/fugue/ruler-crop.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/ruler-crop.png
rename to Greenshot.ImageEditor/Icons/fugue/ruler-crop.png
diff --git a/GreenshotImageEditor/icons/fugue/scissors.png b/Greenshot.ImageEditor/Icons/fugue/scissors.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/scissors.png
rename to Greenshot.ImageEditor/Icons/fugue/scissors.png
diff --git a/GreenshotImageEditor/icons/fugue/slash.png b/Greenshot.ImageEditor/Icons/fugue/slash.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/slash.png
rename to Greenshot.ImageEditor/Icons/fugue/slash.png
diff --git a/GreenshotImageEditor/icons/fugue/tick.png b/Greenshot.ImageEditor/Icons/fugue/tick.png
similarity index 100%
rename from GreenshotImageEditor/icons/fugue/tick.png
rename to Greenshot.ImageEditor/Icons/fugue/tick.png
diff --git a/GreenshotImageEditor/icons/heart.png b/Greenshot.ImageEditor/Icons/heart.png
similarity index 100%
rename from GreenshotImageEditor/icons/heart.png
rename to Greenshot.ImageEditor/Icons/heart.png
diff --git a/GreenshotImageEditor/icons/help.png b/Greenshot.ImageEditor/Icons/help.png
similarity index 100%
rename from GreenshotImageEditor/icons/help.png
rename to Greenshot.ImageEditor/Icons/help.png
diff --git a/GreenshotImageEditor/icons/highlighter.png b/Greenshot.ImageEditor/Icons/highlighter.png
similarity index 100%
rename from GreenshotImageEditor/icons/highlighter.png
rename to Greenshot.ImageEditor/Icons/highlighter.png
diff --git a/GreenshotImageEditor/icons/layer-rotate-left.png b/Greenshot.ImageEditor/Icons/layer-rotate-left.png
similarity index 100%
rename from GreenshotImageEditor/icons/layer-rotate-left.png
rename to Greenshot.ImageEditor/Icons/layer-rotate-left.png
diff --git a/GreenshotImageEditor/icons/layer-rotate.png b/Greenshot.ImageEditor/Icons/layer-rotate.png
similarity index 100%
rename from GreenshotImageEditor/icons/layer-rotate.png
rename to Greenshot.ImageEditor/Icons/layer-rotate.png
diff --git a/GreenshotImageEditor/icons/notification-counter-01.png b/Greenshot.ImageEditor/Icons/notification-counter-01.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-01.png
rename to Greenshot.ImageEditor/Icons/notification-counter-01.png
diff --git a/GreenshotImageEditor/icons/notification-counter-02.png b/Greenshot.ImageEditor/Icons/notification-counter-02.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-02.png
rename to Greenshot.ImageEditor/Icons/notification-counter-02.png
diff --git a/GreenshotImageEditor/icons/notification-counter-03.png b/Greenshot.ImageEditor/Icons/notification-counter-03.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-03.png
rename to Greenshot.ImageEditor/Icons/notification-counter-03.png
diff --git a/GreenshotImageEditor/icons/notification-counter-04.png b/Greenshot.ImageEditor/Icons/notification-counter-04.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-04.png
rename to Greenshot.ImageEditor/Icons/notification-counter-04.png
diff --git a/GreenshotImageEditor/icons/notification-counter-05.png b/Greenshot.ImageEditor/Icons/notification-counter-05.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-05.png
rename to Greenshot.ImageEditor/Icons/notification-counter-05.png
diff --git a/GreenshotImageEditor/icons/notification-counter-06.png b/Greenshot.ImageEditor/Icons/notification-counter-06.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-06.png
rename to Greenshot.ImageEditor/Icons/notification-counter-06.png
diff --git a/GreenshotImageEditor/icons/notification-counter-07.png b/Greenshot.ImageEditor/Icons/notification-counter-07.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-07.png
rename to Greenshot.ImageEditor/Icons/notification-counter-07.png
diff --git a/GreenshotImageEditor/icons/notification-counter-08.png b/Greenshot.ImageEditor/Icons/notification-counter-08.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-08.png
rename to Greenshot.ImageEditor/Icons/notification-counter-08.png
diff --git a/GreenshotImageEditor/icons/notification-counter-09.png b/Greenshot.ImageEditor/Icons/notification-counter-09.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-09.png
rename to Greenshot.ImageEditor/Icons/notification-counter-09.png
diff --git a/GreenshotImageEditor/icons/notification-counter-10.png b/Greenshot.ImageEditor/Icons/notification-counter-10.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-10.png
rename to Greenshot.ImageEditor/Icons/notification-counter-10.png
diff --git a/GreenshotImageEditor/icons/notification-counter-11.png b/Greenshot.ImageEditor/Icons/notification-counter-11.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-11.png
rename to Greenshot.ImageEditor/Icons/notification-counter-11.png
diff --git a/GreenshotImageEditor/icons/notification-counter-12.png b/Greenshot.ImageEditor/Icons/notification-counter-12.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-12.png
rename to Greenshot.ImageEditor/Icons/notification-counter-12.png
diff --git a/GreenshotImageEditor/icons/notification-counter-13.png b/Greenshot.ImageEditor/Icons/notification-counter-13.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-13.png
rename to Greenshot.ImageEditor/Icons/notification-counter-13.png
diff --git a/GreenshotImageEditor/icons/notification-counter-14.png b/Greenshot.ImageEditor/Icons/notification-counter-14.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-14.png
rename to Greenshot.ImageEditor/Icons/notification-counter-14.png
diff --git a/GreenshotImageEditor/icons/notification-counter-15.png b/Greenshot.ImageEditor/Icons/notification-counter-15.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-15.png
rename to Greenshot.ImageEditor/Icons/notification-counter-15.png
diff --git a/GreenshotImageEditor/icons/notification-counter-16.png b/Greenshot.ImageEditor/Icons/notification-counter-16.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-16.png
rename to Greenshot.ImageEditor/Icons/notification-counter-16.png
diff --git a/GreenshotImageEditor/icons/notification-counter-17.png b/Greenshot.ImageEditor/Icons/notification-counter-17.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-17.png
rename to Greenshot.ImageEditor/Icons/notification-counter-17.png
diff --git a/GreenshotImageEditor/icons/notification-counter-18.png b/Greenshot.ImageEditor/Icons/notification-counter-18.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-18.png
rename to Greenshot.ImageEditor/Icons/notification-counter-18.png
diff --git a/GreenshotImageEditor/icons/notification-counter-19.png b/Greenshot.ImageEditor/Icons/notification-counter-19.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-19.png
rename to Greenshot.ImageEditor/Icons/notification-counter-19.png
diff --git a/GreenshotImageEditor/icons/notification-counter-20-plus.png b/Greenshot.ImageEditor/Icons/notification-counter-20-plus.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-20-plus.png
rename to Greenshot.ImageEditor/Icons/notification-counter-20-plus.png
diff --git a/GreenshotImageEditor/icons/notification-counter-20.png b/Greenshot.ImageEditor/Icons/notification-counter-20.png
similarity index 100%
rename from GreenshotImageEditor/icons/notification-counter-20.png
rename to Greenshot.ImageEditor/Icons/notification-counter-20.png
diff --git a/GreenshotImageEditor/icons/page_copy.png b/Greenshot.ImageEditor/Icons/page_copy.png
similarity index 100%
rename from GreenshotImageEditor/icons/page_copy.png
rename to Greenshot.ImageEditor/Icons/page_copy.png
diff --git a/GreenshotImageEditor/icons/palette.png b/Greenshot.ImageEditor/Icons/palette.png
similarity index 100%
rename from GreenshotImageEditor/icons/palette.png
rename to Greenshot.ImageEditor/Icons/palette.png
diff --git a/GreenshotImageEditor/icons/picture_save.png b/Greenshot.ImageEditor/Icons/picture_save.png
similarity index 100%
rename from GreenshotImageEditor/icons/picture_save.png
rename to Greenshot.ImageEditor/Icons/picture_save.png
diff --git a/GreenshotImageEditor/icons/picture_saveas.png b/Greenshot.ImageEditor/Icons/picture_saveas.png
similarity index 100%
rename from GreenshotImageEditor/icons/picture_saveas.png
rename to Greenshot.ImageEditor/Icons/picture_saveas.png
diff --git a/GreenshotImageEditor/icons/picture_to_clipboard.png b/Greenshot.ImageEditor/Icons/picture_to_clipboard.png
similarity index 100%
rename from GreenshotImageEditor/icons/picture_to_clipboard.png
rename to Greenshot.ImageEditor/Icons/picture_to_clipboard.png
diff --git a/GreenshotImageEditor/icons/pipette.png b/Greenshot.ImageEditor/Icons/pipette.png
similarity index 100%
rename from GreenshotImageEditor/icons/pipette.png
rename to Greenshot.ImageEditor/Icons/pipette.png
diff --git a/GreenshotImageEditor/icons/printer.png b/Greenshot.ImageEditor/Icons/printer.png
similarity index 100%
rename from GreenshotImageEditor/icons/printer.png
rename to Greenshot.ImageEditor/Icons/printer.png
diff --git a/GreenshotImageEditor/icons/propertyitemcontainer.gif b/Greenshot.ImageEditor/Icons/propertyitemcontainer.gif
similarity index 100%
rename from GreenshotImageEditor/icons/propertyitemcontainer.gif
rename to Greenshot.ImageEditor/Icons/propertyitemcontainer.gif
diff --git a/GreenshotImageEditor/icons/redo.png b/Greenshot.ImageEditor/Icons/redo.png
similarity index 100%
rename from GreenshotImageEditor/icons/redo.png
rename to Greenshot.ImageEditor/Icons/redo.png
diff --git a/GreenshotImageEditor/icons/resize.png b/Greenshot.ImageEditor/Icons/resize.png
similarity index 100%
rename from GreenshotImageEditor/icons/resize.png
rename to Greenshot.ImageEditor/Icons/resize.png
diff --git a/GreenshotImageEditor/icons/ruler-crop.png b/Greenshot.ImageEditor/Icons/ruler-crop.png
similarity index 100%
rename from GreenshotImageEditor/icons/ruler-crop.png
rename to Greenshot.ImageEditor/Icons/ruler-crop.png
diff --git a/GreenshotImageEditor/icons/shadow.png b/Greenshot.ImageEditor/Icons/shadow.png
similarity index 100%
rename from GreenshotImageEditor/icons/shadow.png
rename to Greenshot.ImageEditor/Icons/shadow.png
diff --git a/GreenshotImageEditor/icons/shape_arrow_add.png b/Greenshot.ImageEditor/Icons/shape_arrow_add.png
similarity index 100%
rename from GreenshotImageEditor/icons/shape_arrow_add.png
rename to Greenshot.ImageEditor/Icons/shape_arrow_add.png
diff --git a/GreenshotImageEditor/icons/shape_arrowheads.png b/Greenshot.ImageEditor/Icons/shape_arrowheads.png
similarity index 100%
rename from GreenshotImageEditor/icons/shape_arrowheads.png
rename to Greenshot.ImageEditor/Icons/shape_arrowheads.png
diff --git a/GreenshotImageEditor/icons/shape_copy.png b/Greenshot.ImageEditor/Icons/shape_copy.png
similarity index 100%
rename from GreenshotImageEditor/icons/shape_copy.png
rename to Greenshot.ImageEditor/Icons/shape_copy.png
diff --git a/GreenshotImageEditor/icons/shape_ellipse_add.png b/Greenshot.ImageEditor/Icons/shape_ellipse_add.png
similarity index 100%
rename from GreenshotImageEditor/icons/shape_ellipse_add.png
rename to Greenshot.ImageEditor/Icons/shape_ellipse_add.png
diff --git a/GreenshotImageEditor/icons/shape_ellipse_delete.png b/Greenshot.ImageEditor/Icons/shape_ellipse_delete.png
similarity index 100%
rename from GreenshotImageEditor/icons/shape_ellipse_delete.png
rename to Greenshot.ImageEditor/Icons/shape_ellipse_delete.png
diff --git a/GreenshotImageEditor/icons/shape_line.png b/Greenshot.ImageEditor/Icons/shape_line.png
similarity index 100%
rename from GreenshotImageEditor/icons/shape_line.png
rename to Greenshot.ImageEditor/Icons/shape_line.png
diff --git a/GreenshotImageEditor/icons/shape_paste.png b/Greenshot.ImageEditor/Icons/shape_paste.png
similarity index 100%
rename from GreenshotImageEditor/icons/shape_paste.png
rename to Greenshot.ImageEditor/Icons/shape_paste.png
diff --git a/GreenshotImageEditor/icons/shape_square_add.png b/Greenshot.ImageEditor/Icons/shape_square_add.png
similarity index 100%
rename from GreenshotImageEditor/icons/shape_square_add.png
rename to Greenshot.ImageEditor/Icons/shape_square_add.png
diff --git a/GreenshotImageEditor/icons/shape_square_bordercolor.png b/Greenshot.ImageEditor/Icons/shape_square_bordercolor.png
similarity index 100%
rename from GreenshotImageEditor/icons/shape_square_bordercolor.png
rename to Greenshot.ImageEditor/Icons/shape_square_bordercolor.png
diff --git a/GreenshotImageEditor/icons/shape_square_delete.png b/Greenshot.ImageEditor/Icons/shape_square_delete.png
similarity index 100%
rename from GreenshotImageEditor/icons/shape_square_delete.png
rename to Greenshot.ImageEditor/Icons/shape_square_delete.png
diff --git a/GreenshotImageEditor/icons/shape_square_fillcolor.png b/Greenshot.ImageEditor/Icons/shape_square_fillcolor.png
similarity index 100%
rename from GreenshotImageEditor/icons/shape_square_fillcolor.png
rename to Greenshot.ImageEditor/Icons/shape_square_fillcolor.png
diff --git a/GreenshotImageEditor/icons/text_bold.png b/Greenshot.ImageEditor/Icons/text_bold.png
similarity index 100%
rename from GreenshotImageEditor/icons/text_bold.png
rename to Greenshot.ImageEditor/Icons/text_bold.png
diff --git a/GreenshotImageEditor/icons/text_dropcaps.png b/Greenshot.ImageEditor/Icons/text_dropcaps.png
similarity index 100%
rename from GreenshotImageEditor/icons/text_dropcaps.png
rename to Greenshot.ImageEditor/Icons/text_dropcaps.png
diff --git a/GreenshotImageEditor/icons/text_italic.png b/Greenshot.ImageEditor/Icons/text_italic.png
similarity index 100%
rename from GreenshotImageEditor/icons/text_italic.png
rename to Greenshot.ImageEditor/Icons/text_italic.png
diff --git a/GreenshotImageEditor/icons/text_underline.png b/Greenshot.ImageEditor/Icons/text_underline.png
similarity index 100%
rename from GreenshotImageEditor/icons/text_underline.png
rename to Greenshot.ImageEditor/Icons/text_underline.png
diff --git a/GreenshotImageEditor/icons/textfield_delete.png b/Greenshot.ImageEditor/Icons/textfield_delete.png
similarity index 100%
rename from GreenshotImageEditor/icons/textfield_delete.png
rename to Greenshot.ImageEditor/Icons/textfield_delete.png
diff --git a/GreenshotImageEditor/icons/undo.png b/Greenshot.ImageEditor/Icons/undo.png
similarity index 100%
rename from GreenshotImageEditor/icons/undo.png
rename to Greenshot.ImageEditor/Icons/undo.png
diff --git a/GreenshotImageEditor/icons/wand-hat.png b/Greenshot.ImageEditor/Icons/wand-hat.png
similarity index 100%
rename from GreenshotImageEditor/icons/wand-hat.png
rename to Greenshot.ImageEditor/Icons/wand-hat.png
diff --git a/GreenshotImageEditor/icons/wrench.png b/Greenshot.ImageEditor/Icons/wrench.png
similarity index 100%
rename from GreenshotImageEditor/icons/wrench.png
rename to Greenshot.ImageEditor/Icons/wrench.png
diff --git a/GreenshotImageEditor/icons/wrench_orange.png b/Greenshot.ImageEditor/Icons/wrench_orange.png
similarity index 100%
rename from GreenshotImageEditor/icons/wrench_orange.png
rename to Greenshot.ImageEditor/Icons/wrench_orange.png
diff --git a/GreenshotImageEditor/icons/zoom.png b/Greenshot.ImageEditor/Icons/zoom.png
similarity index 100%
rename from GreenshotImageEditor/icons/zoom.png
rename to Greenshot.ImageEditor/Icons/zoom.png
diff --git a/GreenshotImageEditor/IniFile/IniAttributes.cs b/Greenshot.ImageEditor/IniFile/IniAttributes.cs
similarity index 100%
rename from GreenshotImageEditor/IniFile/IniAttributes.cs
rename to Greenshot.ImageEditor/IniFile/IniAttributes.cs
diff --git a/GreenshotImageEditor/IniFile/IniConfig.cs b/Greenshot.ImageEditor/IniFile/IniConfig.cs
similarity index 100%
rename from GreenshotImageEditor/IniFile/IniConfig.cs
rename to Greenshot.ImageEditor/IniFile/IniConfig.cs
diff --git a/GreenshotImageEditor/IniFile/IniReader.cs b/Greenshot.ImageEditor/IniFile/IniReader.cs
similarity index 100%
rename from GreenshotImageEditor/IniFile/IniReader.cs
rename to Greenshot.ImageEditor/IniFile/IniReader.cs
diff --git a/GreenshotImageEditor/IniFile/IniSection.cs b/Greenshot.ImageEditor/IniFile/IniSection.cs
similarity index 100%
rename from GreenshotImageEditor/IniFile/IniSection.cs
rename to Greenshot.ImageEditor/IniFile/IniSection.cs
diff --git a/GreenshotImageEditor/IniFile/IniValue.cs b/Greenshot.ImageEditor/IniFile/IniValue.cs
similarity index 100%
rename from GreenshotImageEditor/IniFile/IniValue.cs
rename to Greenshot.ImageEditor/IniFile/IniValue.cs
diff --git a/GreenshotImageEditor/Interfaces/Capture.cs b/Greenshot.ImageEditor/Interfaces/Capture.cs
similarity index 100%
rename from GreenshotImageEditor/Interfaces/Capture.cs
rename to Greenshot.ImageEditor/Interfaces/Capture.cs
diff --git a/GreenshotImageEditor/Interfaces/Drawing/Container.cs b/Greenshot.ImageEditor/Interfaces/Drawing/Container.cs
similarity index 100%
rename from GreenshotImageEditor/Interfaces/Drawing/Container.cs
rename to Greenshot.ImageEditor/Interfaces/Drawing/Container.cs
diff --git a/GreenshotImageEditor/Interfaces/Forms/ImageEditor.cs b/Greenshot.ImageEditor/Interfaces/Forms/ImageEditor.cs
similarity index 100%
rename from GreenshotImageEditor/Interfaces/Forms/ImageEditor.cs
rename to Greenshot.ImageEditor/Interfaces/Forms/ImageEditor.cs
diff --git a/GreenshotImageEditor/Interfaces/Generic.cs b/Greenshot.ImageEditor/Interfaces/Generic.cs
similarity index 100%
rename from GreenshotImageEditor/Interfaces/Generic.cs
rename to Greenshot.ImageEditor/Interfaces/Generic.cs
diff --git a/GreenshotImageEditor/Interfaces/IDestination.cs b/Greenshot.ImageEditor/Interfaces/IDestination.cs
similarity index 100%
rename from GreenshotImageEditor/Interfaces/IDestination.cs
rename to Greenshot.ImageEditor/Interfaces/IDestination.cs
diff --git a/GreenshotImageEditor/Interfaces/IProcessor.cs b/Greenshot.ImageEditor/Interfaces/IProcessor.cs
similarity index 100%
rename from GreenshotImageEditor/Interfaces/IProcessor.cs
rename to Greenshot.ImageEditor/Interfaces/IProcessor.cs
diff --git a/GreenshotImageEditor/Interfaces/Plugin/PluginInterfaces.cs b/Greenshot.ImageEditor/Interfaces/Plugin/PluginInterfaces.cs
similarity index 100%
rename from GreenshotImageEditor/Interfaces/Plugin/PluginInterfaces.cs
rename to Greenshot.ImageEditor/Interfaces/Plugin/PluginInterfaces.cs
diff --git a/GreenshotImageEditor/Interop/Base.cs b/Greenshot.ImageEditor/Interop/Base.cs
similarity index 100%
rename from GreenshotImageEditor/Interop/Base.cs
rename to Greenshot.ImageEditor/Interop/Base.cs
diff --git a/GreenshotImageEditor/Interop/COMWrapper.cs b/Greenshot.ImageEditor/Interop/COMWrapper.cs
similarity index 100%
rename from GreenshotImageEditor/Interop/COMWrapper.cs
rename to Greenshot.ImageEditor/Interop/COMWrapper.cs
diff --git a/GreenshotImageEditor/Interop/ComProgIdAttribute.cs b/Greenshot.ImageEditor/Interop/ComProgIdAttribute.cs
similarity index 100%
rename from GreenshotImageEditor/Interop/ComProgIdAttribute.cs
rename to Greenshot.ImageEditor/Interop/ComProgIdAttribute.cs
diff --git a/GreenshotImageEditor/Interop/IAppVisibility.cs b/Greenshot.ImageEditor/Interop/IAppVisibility.cs
similarity index 100%
rename from GreenshotImageEditor/Interop/IAppVisibility.cs
rename to Greenshot.ImageEditor/Interop/IAppVisibility.cs
diff --git a/GreenshotImageEditor/Interop/IOleCommandTarget.cs b/Greenshot.ImageEditor/Interop/IOleCommandTarget.cs
similarity index 100%
rename from GreenshotImageEditor/Interop/IOleCommandTarget.cs
rename to Greenshot.ImageEditor/Interop/IOleCommandTarget.cs
diff --git a/GreenshotImageEditor/Interop/IOleWindow.cs b/Greenshot.ImageEditor/Interop/IOleWindow.cs
similarity index 100%
rename from GreenshotImageEditor/Interop/IOleWindow.cs
rename to Greenshot.ImageEditor/Interop/IOleWindow.cs
diff --git a/GreenshotImageEditor/Interop/IServiceProvider.cs b/Greenshot.ImageEditor/Interop/IServiceProvider.cs
similarity index 100%
rename from GreenshotImageEditor/Interop/IServiceProvider.cs
rename to Greenshot.ImageEditor/Interop/IServiceProvider.cs
diff --git a/GreenshotImageEditor/Memento/AddElementMemento.cs b/Greenshot.ImageEditor/Memento/AddElementMemento.cs
similarity index 100%
rename from GreenshotImageEditor/Memento/AddElementMemento.cs
rename to Greenshot.ImageEditor/Memento/AddElementMemento.cs
diff --git a/GreenshotImageEditor/Memento/ChangeFieldHolderMemento.cs b/Greenshot.ImageEditor/Memento/ChangeFieldHolderMemento.cs
similarity index 100%
rename from GreenshotImageEditor/Memento/ChangeFieldHolderMemento.cs
rename to Greenshot.ImageEditor/Memento/ChangeFieldHolderMemento.cs
diff --git a/GreenshotImageEditor/Memento/DeleteElementMemento.cs b/Greenshot.ImageEditor/Memento/DeleteElementMemento.cs
similarity index 100%
rename from GreenshotImageEditor/Memento/DeleteElementMemento.cs
rename to Greenshot.ImageEditor/Memento/DeleteElementMemento.cs
diff --git a/GreenshotImageEditor/Memento/DrawableContainerBoundsChangeMemento.cs b/Greenshot.ImageEditor/Memento/DrawableContainerBoundsChangeMemento.cs
similarity index 100%
rename from GreenshotImageEditor/Memento/DrawableContainerBoundsChangeMemento.cs
rename to Greenshot.ImageEditor/Memento/DrawableContainerBoundsChangeMemento.cs
diff --git a/GreenshotImageEditor/Memento/IMemento.cs b/Greenshot.ImageEditor/Memento/IMemento.cs
similarity index 100%
rename from GreenshotImageEditor/Memento/IMemento.cs
rename to Greenshot.ImageEditor/Memento/IMemento.cs
diff --git a/GreenshotImageEditor/Memento/SurfaceBackgroundChangeMemento.cs b/Greenshot.ImageEditor/Memento/SurfaceBackgroundChangeMemento.cs
similarity index 100%
rename from GreenshotImageEditor/Memento/SurfaceBackgroundChangeMemento.cs
rename to Greenshot.ImageEditor/Memento/SurfaceBackgroundChangeMemento.cs
diff --git a/GreenshotImageEditor/Memento/TextChangeMemento.cs b/Greenshot.ImageEditor/Memento/TextChangeMemento.cs
similarity index 100%
rename from GreenshotImageEditor/Memento/TextChangeMemento.cs
rename to Greenshot.ImageEditor/Memento/TextChangeMemento.cs
diff --git a/GreenshotImageEditor/Properties/AssemblyInfo.cs b/Greenshot.ImageEditor/Properties/AssemblyInfo.cs
similarity index 94%
rename from GreenshotImageEditor/Properties/AssemblyInfo.cs
rename to Greenshot.ImageEditor/Properties/AssemblyInfo.cs
index da681200d..682939b16 100644
--- a/GreenshotImageEditor/Properties/AssemblyInfo.cs
+++ b/Greenshot.ImageEditor/Properties/AssemblyInfo.cs
@@ -28,11 +28,11 @@
 // change them to the information which is associated with the assembly
 // you compile.
 
-[assembly: AssemblyTitle("GreenshotImageEditor")]
+[assembly: AssemblyTitle("Greenshot ImageEditor")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Greenshot")]
-[assembly: AssemblyProduct("GreenshotImageEditor")]
+[assembly: AssemblyProduct("Greenshot")]
 [assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/GreenshotImageEditor/Properties/Resources.Designer.cs b/Greenshot.ImageEditor/Properties/Resources.Designer.cs
similarity index 100%
rename from GreenshotImageEditor/Properties/Resources.Designer.cs
rename to Greenshot.ImageEditor/Properties/Resources.Designer.cs
diff --git a/GreenshotImageEditor/Properties/Resources.resx b/Greenshot.ImageEditor/Properties/Resources.resx
similarity index 100%
rename from GreenshotImageEditor/Properties/Resources.resx
rename to Greenshot.ImageEditor/Properties/Resources.resx
diff --git a/GreenshotImageEditor/UnmanagedHelpers/DWM.cs b/Greenshot.ImageEditor/UnmanagedHelpers/DWM.cs
similarity index 100%
rename from GreenshotImageEditor/UnmanagedHelpers/DWM.cs
rename to Greenshot.ImageEditor/UnmanagedHelpers/DWM.cs
diff --git a/GreenshotImageEditor/UnmanagedHelpers/Enumerations.cs b/Greenshot.ImageEditor/UnmanagedHelpers/Enumerations.cs
similarity index 100%
rename from GreenshotImageEditor/UnmanagedHelpers/Enumerations.cs
rename to Greenshot.ImageEditor/UnmanagedHelpers/Enumerations.cs
diff --git a/GreenshotImageEditor/UnmanagedHelpers/GDI32.cs b/Greenshot.ImageEditor/UnmanagedHelpers/GDI32.cs
similarity index 100%
rename from GreenshotImageEditor/UnmanagedHelpers/GDI32.cs
rename to Greenshot.ImageEditor/UnmanagedHelpers/GDI32.cs
diff --git a/GreenshotImageEditor/UnmanagedHelpers/GDIplus.cs b/Greenshot.ImageEditor/UnmanagedHelpers/GDIplus.cs
similarity index 100%
rename from GreenshotImageEditor/UnmanagedHelpers/GDIplus.cs
rename to Greenshot.ImageEditor/UnmanagedHelpers/GDIplus.cs
diff --git a/GreenshotImageEditor/UnmanagedHelpers/Kernel32.cs b/Greenshot.ImageEditor/UnmanagedHelpers/Kernel32.cs
similarity index 100%
rename from GreenshotImageEditor/UnmanagedHelpers/Kernel32.cs
rename to Greenshot.ImageEditor/UnmanagedHelpers/Kernel32.cs
diff --git a/GreenshotImageEditor/UnmanagedHelpers/PsAPI.cs b/Greenshot.ImageEditor/UnmanagedHelpers/PsAPI.cs
similarity index 100%
rename from GreenshotImageEditor/UnmanagedHelpers/PsAPI.cs
rename to Greenshot.ImageEditor/UnmanagedHelpers/PsAPI.cs
diff --git a/GreenshotImageEditor/UnmanagedHelpers/Shell32.cs b/Greenshot.ImageEditor/UnmanagedHelpers/Shell32.cs
similarity index 100%
rename from GreenshotImageEditor/UnmanagedHelpers/Shell32.cs
rename to Greenshot.ImageEditor/UnmanagedHelpers/Shell32.cs
diff --git a/GreenshotImageEditor/UnmanagedHelpers/Structs.cs b/Greenshot.ImageEditor/UnmanagedHelpers/Structs.cs
similarity index 100%
rename from GreenshotImageEditor/UnmanagedHelpers/Structs.cs
rename to Greenshot.ImageEditor/UnmanagedHelpers/Structs.cs
diff --git a/GreenshotImageEditor/UnmanagedHelpers/User32.cs b/Greenshot.ImageEditor/UnmanagedHelpers/User32.cs
similarity index 100%
rename from GreenshotImageEditor/UnmanagedHelpers/User32.cs
rename to Greenshot.ImageEditor/UnmanagedHelpers/User32.cs
diff --git a/GreenshotImageEditor/UnmanagedHelpers/Win32Errors.cs b/Greenshot.ImageEditor/UnmanagedHelpers/Win32Errors.cs
similarity index 100%
rename from GreenshotImageEditor/UnmanagedHelpers/Win32Errors.cs
rename to Greenshot.ImageEditor/UnmanagedHelpers/Win32Errors.cs
diff --git a/GreenshotImageEditor/UnmanagedHelpers/WinMM.cs b/Greenshot.ImageEditor/UnmanagedHelpers/WinMM.cs
similarity index 100%
rename from GreenshotImageEditor/UnmanagedHelpers/WinMM.cs
rename to Greenshot.ImageEditor/UnmanagedHelpers/WinMM.cs
diff --git a/HelpersLib/ActionsCodeMenuEntry.cs b/ShareX.HelpersLib/ActionsCodeMenuEntry.cs
similarity index 100%
rename from HelpersLib/ActionsCodeMenuEntry.cs
rename to ShareX.HelpersLib/ActionsCodeMenuEntry.cs
diff --git a/HelpersLib/CLI/CLICommand.cs b/ShareX.HelpersLib/CLI/CLICommand.cs
similarity index 100%
rename from HelpersLib/CLI/CLICommand.cs
rename to ShareX.HelpersLib/CLI/CLICommand.cs
diff --git a/HelpersLib/CLI/CLICommandAction.cs b/ShareX.HelpersLib/CLI/CLICommandAction.cs
similarity index 100%
rename from HelpersLib/CLI/CLICommandAction.cs
rename to ShareX.HelpersLib/CLI/CLICommandAction.cs
diff --git a/HelpersLib/CLI/CLIManager.cs b/ShareX.HelpersLib/CLI/CLIManager.cs
similarity index 100%
rename from HelpersLib/CLI/CLIManager.cs
rename to ShareX.HelpersLib/CLI/CLIManager.cs
diff --git a/HelpersLib/CLI/ExternalCLIManager.cs b/ShareX.HelpersLib/CLI/ExternalCLIManager.cs
similarity index 100%
rename from HelpersLib/CLI/ExternalCLIManager.cs
rename to ShareX.HelpersLib/CLI/ExternalCLIManager.cs
diff --git a/HelpersLib/ClipboardFormat.cs b/ShareX.HelpersLib/ClipboardFormat.cs
similarity index 100%
rename from HelpersLib/ClipboardFormat.cs
rename to ShareX.HelpersLib/ClipboardFormat.cs
diff --git a/HelpersLib/CodeMenu.cs b/ShareX.HelpersLib/CodeMenu.cs
similarity index 100%
rename from HelpersLib/CodeMenu.cs
rename to ShareX.HelpersLib/CodeMenu.cs
diff --git a/HelpersLib/CodeMenuEntry.cs b/ShareX.HelpersLib/CodeMenuEntry.cs
similarity index 100%
rename from HelpersLib/CodeMenuEntry.cs
rename to ShareX.HelpersLib/CodeMenuEntry.cs
diff --git a/HelpersLib/ColorBgra.cs b/ShareX.HelpersLib/ColorBgra.cs
similarity index 100%
rename from HelpersLib/ColorBgra.cs
rename to ShareX.HelpersLib/ColorBgra.cs
diff --git a/HelpersLib/ColorMatrixManager.cs b/ShareX.HelpersLib/ColorMatrixManager.cs
similarity index 100%
rename from HelpersLib/ColorMatrixManager.cs
rename to ShareX.HelpersLib/ColorMatrixManager.cs
diff --git a/HelpersLib/Colors/CMYK.cs b/ShareX.HelpersLib/Colors/CMYK.cs
similarity index 100%
rename from HelpersLib/Colors/CMYK.cs
rename to ShareX.HelpersLib/Colors/CMYK.cs
diff --git a/HelpersLib/Colors/ColorBox.cs b/ShareX.HelpersLib/Colors/ColorBox.cs
similarity index 100%
rename from HelpersLib/Colors/ColorBox.cs
rename to ShareX.HelpersLib/Colors/ColorBox.cs
diff --git a/HelpersLib/Colors/ColorEventHandler.cs b/ShareX.HelpersLib/Colors/ColorEventHandler.cs
similarity index 100%
rename from HelpersLib/Colors/ColorEventHandler.cs
rename to ShareX.HelpersLib/Colors/ColorEventHandler.cs
diff --git a/HelpersLib/Colors/ColorPicker.cs b/ShareX.HelpersLib/Colors/ColorPicker.cs
similarity index 100%
rename from HelpersLib/Colors/ColorPicker.cs
rename to ShareX.HelpersLib/Colors/ColorPicker.cs
diff --git a/HelpersLib/Colors/ColorPickerForm.Designer.cs b/ShareX.HelpersLib/Colors/ColorPickerForm.Designer.cs
similarity index 100%
rename from HelpersLib/Colors/ColorPickerForm.Designer.cs
rename to ShareX.HelpersLib/Colors/ColorPickerForm.Designer.cs
diff --git a/HelpersLib/Colors/ColorPickerForm.cs b/ShareX.HelpersLib/Colors/ColorPickerForm.cs
similarity index 100%
rename from HelpersLib/Colors/ColorPickerForm.cs
rename to ShareX.HelpersLib/Colors/ColorPickerForm.cs
diff --git a/HelpersLib/Colors/ColorPickerForm.resx b/ShareX.HelpersLib/Colors/ColorPickerForm.resx
similarity index 100%
rename from HelpersLib/Colors/ColorPickerForm.resx
rename to ShareX.HelpersLib/Colors/ColorPickerForm.resx
diff --git a/HelpersLib/Colors/ColorPickerForm.tr.resx b/ShareX.HelpersLib/Colors/ColorPickerForm.tr.resx
similarity index 100%
rename from HelpersLib/Colors/ColorPickerForm.tr.resx
rename to ShareX.HelpersLib/Colors/ColorPickerForm.tr.resx
diff --git a/HelpersLib/Colors/ColorSlider.cs b/ShareX.HelpersLib/Colors/ColorSlider.cs
similarity index 100%
rename from HelpersLib/Colors/ColorSlider.cs
rename to ShareX.HelpersLib/Colors/ColorSlider.cs
diff --git a/HelpersLib/Colors/ColorUserControl.cs b/ShareX.HelpersLib/Colors/ColorUserControl.cs
similarity index 100%
rename from HelpersLib/Colors/ColorUserControl.cs
rename to ShareX.HelpersLib/Colors/ColorUserControl.cs
diff --git a/HelpersLib/Colors/GradientInfo.cs b/ShareX.HelpersLib/Colors/GradientInfo.cs
similarity index 100%
rename from HelpersLib/Colors/GradientInfo.cs
rename to ShareX.HelpersLib/Colors/GradientInfo.cs
diff --git a/HelpersLib/Colors/GradientPickerForm.Designer.cs b/ShareX.HelpersLib/Colors/GradientPickerForm.Designer.cs
similarity index 100%
rename from HelpersLib/Colors/GradientPickerForm.Designer.cs
rename to ShareX.HelpersLib/Colors/GradientPickerForm.Designer.cs
diff --git a/HelpersLib/Colors/GradientPickerForm.cs b/ShareX.HelpersLib/Colors/GradientPickerForm.cs
similarity index 100%
rename from HelpersLib/Colors/GradientPickerForm.cs
rename to ShareX.HelpersLib/Colors/GradientPickerForm.cs
diff --git a/HelpersLib/Colors/GradientPickerForm.resx b/ShareX.HelpersLib/Colors/GradientPickerForm.resx
similarity index 100%
rename from HelpersLib/Colors/GradientPickerForm.resx
rename to ShareX.HelpersLib/Colors/GradientPickerForm.resx
diff --git a/HelpersLib/Colors/GradientPickerForm.tr.resx b/ShareX.HelpersLib/Colors/GradientPickerForm.tr.resx
similarity index 100%
rename from HelpersLib/Colors/GradientPickerForm.tr.resx
rename to ShareX.HelpersLib/Colors/GradientPickerForm.tr.resx
diff --git a/HelpersLib/Colors/GradientStop.cs b/ShareX.HelpersLib/Colors/GradientStop.cs
similarity index 100%
rename from HelpersLib/Colors/GradientStop.cs
rename to ShareX.HelpersLib/Colors/GradientStop.cs
diff --git a/HelpersLib/Colors/HSB.cs b/ShareX.HelpersLib/Colors/HSB.cs
similarity index 100%
rename from HelpersLib/Colors/HSB.cs
rename to ShareX.HelpersLib/Colors/HSB.cs
diff --git a/HelpersLib/Colors/MyColor.cs b/ShareX.HelpersLib/Colors/MyColor.cs
similarity index 100%
rename from HelpersLib/Colors/MyColor.cs
rename to ShareX.HelpersLib/Colors/MyColor.cs
diff --git a/HelpersLib/Colors/RGBA.cs b/ShareX.HelpersLib/Colors/RGBA.cs
similarity index 100%
rename from HelpersLib/Colors/RGBA.cs
rename to ShareX.HelpersLib/Colors/RGBA.cs
diff --git a/HelpersLib/Controls/BlackStyle/BlackStyleButton.cs b/ShareX.HelpersLib/Controls/BlackStyle/BlackStyleButton.cs
similarity index 100%
rename from HelpersLib/Controls/BlackStyle/BlackStyleButton.cs
rename to ShareX.HelpersLib/Controls/BlackStyle/BlackStyleButton.cs
diff --git a/HelpersLib/Controls/BlackStyle/BlackStyleCheckBox.cs b/ShareX.HelpersLib/Controls/BlackStyle/BlackStyleCheckBox.cs
similarity index 100%
rename from HelpersLib/Controls/BlackStyle/BlackStyleCheckBox.cs
rename to ShareX.HelpersLib/Controls/BlackStyle/BlackStyleCheckBox.cs
diff --git a/HelpersLib/Controls/BlackStyle/BlackStyleLabel.cs b/ShareX.HelpersLib/Controls/BlackStyle/BlackStyleLabel.cs
similarity index 100%
rename from HelpersLib/Controls/BlackStyle/BlackStyleLabel.cs
rename to ShareX.HelpersLib/Controls/BlackStyle/BlackStyleLabel.cs
diff --git a/HelpersLib/Controls/BlackStyle/BlackStyleProgressBar.cs b/ShareX.HelpersLib/Controls/BlackStyle/BlackStyleProgressBar.cs
similarity index 100%
rename from HelpersLib/Controls/BlackStyle/BlackStyleProgressBar.cs
rename to ShareX.HelpersLib/Controls/BlackStyle/BlackStyleProgressBar.cs
diff --git a/HelpersLib/Controls/Canvas.cs b/ShareX.HelpersLib/Controls/Canvas.cs
similarity index 100%
rename from HelpersLib/Controls/Canvas.cs
rename to ShareX.HelpersLib/Controls/Canvas.cs
diff --git a/HelpersLib/Controls/ColorButton.cs b/ShareX.HelpersLib/Controls/ColorButton.cs
similarity index 100%
rename from HelpersLib/Controls/ColorButton.cs
rename to ShareX.HelpersLib/Controls/ColorButton.cs
diff --git a/HelpersLib/Controls/ExportImportControl.Designer.cs b/ShareX.HelpersLib/Controls/ExportImportControl.Designer.cs
similarity index 100%
rename from HelpersLib/Controls/ExportImportControl.Designer.cs
rename to ShareX.HelpersLib/Controls/ExportImportControl.Designer.cs
diff --git a/HelpersLib/Controls/ExportImportControl.cs b/ShareX.HelpersLib/Controls/ExportImportControl.cs
similarity index 100%
rename from HelpersLib/Controls/ExportImportControl.cs
rename to ShareX.HelpersLib/Controls/ExportImportControl.cs
diff --git a/HelpersLib/Controls/ExportImportControl.resx b/ShareX.HelpersLib/Controls/ExportImportControl.resx
similarity index 100%
rename from HelpersLib/Controls/ExportImportControl.resx
rename to ShareX.HelpersLib/Controls/ExportImportControl.resx
diff --git a/HelpersLib/Controls/ExportImportControl.tr.resx b/ShareX.HelpersLib/Controls/ExportImportControl.tr.resx
similarity index 100%
rename from HelpersLib/Controls/ExportImportControl.tr.resx
rename to ShareX.HelpersLib/Controls/ExportImportControl.tr.resx
diff --git a/HelpersLib/Controls/MenuButton.cs b/ShareX.HelpersLib/Controls/MenuButton.cs
similarity index 100%
rename from HelpersLib/Controls/MenuButton.cs
rename to ShareX.HelpersLib/Controls/MenuButton.cs
diff --git a/HelpersLib/Controls/MyListView.cs b/ShareX.HelpersLib/Controls/MyListView.cs
similarity index 100%
rename from HelpersLib/Controls/MyListView.cs
rename to ShareX.HelpersLib/Controls/MyListView.cs
diff --git a/HelpersLib/Controls/MyPictureBox.Designer.cs b/ShareX.HelpersLib/Controls/MyPictureBox.Designer.cs
similarity index 100%
rename from HelpersLib/Controls/MyPictureBox.Designer.cs
rename to ShareX.HelpersLib/Controls/MyPictureBox.Designer.cs
diff --git a/HelpersLib/Controls/MyPictureBox.cs b/ShareX.HelpersLib/Controls/MyPictureBox.cs
similarity index 100%
rename from HelpersLib/Controls/MyPictureBox.cs
rename to ShareX.HelpersLib/Controls/MyPictureBox.cs
diff --git a/HelpersLib/Controls/MyPictureBox.resx b/ShareX.HelpersLib/Controls/MyPictureBox.resx
similarity index 100%
rename from HelpersLib/Controls/MyPictureBox.resx
rename to ShareX.HelpersLib/Controls/MyPictureBox.resx
diff --git a/HelpersLib/Controls/MyPictureBox.tr.resx b/ShareX.HelpersLib/Controls/MyPictureBox.tr.resx
similarity index 100%
rename from HelpersLib/Controls/MyPictureBox.tr.resx
rename to ShareX.HelpersLib/Controls/MyPictureBox.tr.resx
diff --git a/HelpersLib/Controls/NoFocusBorderButton.cs b/ShareX.HelpersLib/Controls/NoFocusBorderButton.cs
similarity index 100%
rename from HelpersLib/Controls/NoFocusBorderButton.cs
rename to ShareX.HelpersLib/Controls/NoFocusBorderButton.cs
diff --git a/HelpersLib/Controls/SplitContainerCustomSplitter.cs b/ShareX.HelpersLib/Controls/SplitContainerCustomSplitter.cs
similarity index 100%
rename from HelpersLib/Controls/SplitContainerCustomSplitter.cs
rename to ShareX.HelpersLib/Controls/SplitContainerCustomSplitter.cs
diff --git a/HelpersLib/Controls/TabToListView.Designer.cs b/ShareX.HelpersLib/Controls/TabToListView.Designer.cs
similarity index 100%
rename from HelpersLib/Controls/TabToListView.Designer.cs
rename to ShareX.HelpersLib/Controls/TabToListView.Designer.cs
diff --git a/HelpersLib/Controls/TabToListView.cs b/ShareX.HelpersLib/Controls/TabToListView.cs
similarity index 100%
rename from HelpersLib/Controls/TabToListView.cs
rename to ShareX.HelpersLib/Controls/TabToListView.cs
diff --git a/HelpersLib/Controls/TabToListView.resx b/ShareX.HelpersLib/Controls/TabToListView.resx
similarity index 100%
rename from HelpersLib/Controls/TabToListView.resx
rename to ShareX.HelpersLib/Controls/TabToListView.resx
diff --git a/HelpersLib/Controls/TabToTreeView.Designer.cs b/ShareX.HelpersLib/Controls/TabToTreeView.Designer.cs
similarity index 100%
rename from HelpersLib/Controls/TabToTreeView.Designer.cs
rename to ShareX.HelpersLib/Controls/TabToTreeView.Designer.cs
diff --git a/HelpersLib/Controls/TabToTreeView.cs b/ShareX.HelpersLib/Controls/TabToTreeView.cs
similarity index 100%
rename from HelpersLib/Controls/TabToTreeView.cs
rename to ShareX.HelpersLib/Controls/TabToTreeView.cs
diff --git a/HelpersLib/Controls/TabToTreeView.resx b/ShareX.HelpersLib/Controls/TabToTreeView.resx
similarity index 100%
rename from HelpersLib/Controls/TabToTreeView.resx
rename to ShareX.HelpersLib/Controls/TabToTreeView.resx
diff --git a/HelpersLib/Controls/TablessControl.cs b/ShareX.HelpersLib/Controls/TablessControl.cs
similarity index 100%
rename from HelpersLib/Controls/TablessControl.cs
rename to ShareX.HelpersLib/Controls/TablessControl.cs
diff --git a/HelpersLib/Controls/ToolStripRadioButtonMenuItem.cs b/ShareX.HelpersLib/Controls/ToolStripRadioButtonMenuItem.cs
similarity index 100%
rename from HelpersLib/Controls/ToolStripRadioButtonMenuItem.cs
rename to ShareX.HelpersLib/Controls/ToolStripRadioButtonMenuItem.cs
diff --git a/HelpersLib/ConvolutionMatrix.cs b/ShareX.HelpersLib/ConvolutionMatrix.cs
similarity index 100%
rename from HelpersLib/ConvolutionMatrix.cs
rename to ShareX.HelpersLib/ConvolutionMatrix.cs
diff --git a/HelpersLib/ConvolutionMatrixManager.cs b/ShareX.HelpersLib/ConvolutionMatrixManager.cs
similarity index 100%
rename from HelpersLib/ConvolutionMatrixManager.cs
rename to ShareX.HelpersLib/ConvolutionMatrixManager.cs
diff --git a/HelpersLib/Cryptographic/Crc32.cs b/ShareX.HelpersLib/Cryptographic/Crc32.cs
similarity index 100%
rename from HelpersLib/Cryptographic/Crc32.cs
rename to ShareX.HelpersLib/Cryptographic/Crc32.cs
diff --git a/HelpersLib/Cryptographic/HashCheck.cs b/ShareX.HelpersLib/Cryptographic/HashCheck.cs
similarity index 100%
rename from HelpersLib/Cryptographic/HashCheck.cs
rename to ShareX.HelpersLib/Cryptographic/HashCheck.cs
diff --git a/HelpersLib/Cryptographic/Translator.cs b/ShareX.HelpersLib/Cryptographic/Translator.cs
similarity index 100%
rename from HelpersLib/Cryptographic/Translator.cs
rename to ShareX.HelpersLib/Cryptographic/Translator.cs
diff --git a/HelpersLib/Cryptographic/TranslatorHelper.cs b/ShareX.HelpersLib/Cryptographic/TranslatorHelper.cs
similarity index 100%
rename from HelpersLib/Cryptographic/TranslatorHelper.cs
rename to ShareX.HelpersLib/Cryptographic/TranslatorHelper.cs
diff --git a/HelpersLib/CursorData.cs b/ShareX.HelpersLib/CursorData.cs
similarity index 100%
rename from HelpersLib/CursorData.cs
rename to ShareX.HelpersLib/CursorData.cs
diff --git a/HelpersLib/DNS/AdapterInfo.cs b/ShareX.HelpersLib/DNS/AdapterInfo.cs
similarity index 100%
rename from HelpersLib/DNS/AdapterInfo.cs
rename to ShareX.HelpersLib/DNS/AdapterInfo.cs
diff --git a/HelpersLib/DNS/DNSChangerForm.Designer.cs b/ShareX.HelpersLib/DNS/DNSChangerForm.Designer.cs
similarity index 100%
rename from HelpersLib/DNS/DNSChangerForm.Designer.cs
rename to ShareX.HelpersLib/DNS/DNSChangerForm.Designer.cs
diff --git a/HelpersLib/DNS/DNSChangerForm.cs b/ShareX.HelpersLib/DNS/DNSChangerForm.cs
similarity index 100%
rename from HelpersLib/DNS/DNSChangerForm.cs
rename to ShareX.HelpersLib/DNS/DNSChangerForm.cs
diff --git a/HelpersLib/DNS/DNSChangerForm.resx b/ShareX.HelpersLib/DNS/DNSChangerForm.resx
similarity index 100%
rename from HelpersLib/DNS/DNSChangerForm.resx
rename to ShareX.HelpersLib/DNS/DNSChangerForm.resx
diff --git a/HelpersLib/DNS/DNSChangerForm.tr.resx b/ShareX.HelpersLib/DNS/DNSChangerForm.tr.resx
similarity index 100%
rename from HelpersLib/DNS/DNSChangerForm.tr.resx
rename to ShareX.HelpersLib/DNS/DNSChangerForm.tr.resx
diff --git a/HelpersLib/DNS/DNSInfo.cs b/ShareX.HelpersLib/DNS/DNSInfo.cs
similarity index 100%
rename from HelpersLib/DNS/DNSInfo.cs
rename to ShareX.HelpersLib/DNS/DNSInfo.cs
diff --git a/HelpersLib/DWMManager.cs b/ShareX.HelpersLib/DWMManager.cs
similarity index 100%
rename from HelpersLib/DWMManager.cs
rename to ShareX.HelpersLib/DWMManager.cs
diff --git a/HelpersLib/DebugHelper.cs b/ShareX.HelpersLib/DebugHelper.cs
similarity index 100%
rename from HelpersLib/DebugHelper.cs
rename to ShareX.HelpersLib/DebugHelper.cs
diff --git a/HelpersLib/DebugTimer.cs b/ShareX.HelpersLib/DebugTimer.cs
similarity index 100%
rename from HelpersLib/DebugTimer.cs
rename to ShareX.HelpersLib/DebugTimer.cs
diff --git a/HelpersLib/EncoderProgram.cs b/ShareX.HelpersLib/EncoderProgram.cs
similarity index 100%
rename from HelpersLib/EncoderProgram.cs
rename to ShareX.HelpersLib/EncoderProgram.cs
diff --git a/HelpersLib/Enums.cs b/ShareX.HelpersLib/Enums.cs
similarity index 100%
rename from HelpersLib/Enums.cs
rename to ShareX.HelpersLib/Enums.cs
diff --git a/HelpersLib/Extensions/EnumExtensions.cs b/ShareX.HelpersLib/Extensions/EnumExtensions.cs
similarity index 100%
rename from HelpersLib/Extensions/EnumExtensions.cs
rename to ShareX.HelpersLib/Extensions/EnumExtensions.cs
diff --git a/HelpersLib/Extensions/Extensions.cs b/ShareX.HelpersLib/Extensions/Extensions.cs
similarity index 100%
rename from HelpersLib/Extensions/Extensions.cs
rename to ShareX.HelpersLib/Extensions/Extensions.cs
diff --git a/HelpersLib/Extensions/GraphicsExtensions.cs b/ShareX.HelpersLib/Extensions/GraphicsExtensions.cs
similarity index 100%
rename from HelpersLib/Extensions/GraphicsExtensions.cs
rename to ShareX.HelpersLib/Extensions/GraphicsExtensions.cs
diff --git a/HelpersLib/Extensions/GraphicsPathExtensions.cs b/ShareX.HelpersLib/Extensions/GraphicsPathExtensions.cs
similarity index 100%
rename from HelpersLib/Extensions/GraphicsPathExtensions.cs
rename to ShareX.HelpersLib/Extensions/GraphicsPathExtensions.cs
diff --git a/HelpersLib/Extensions/NumberExtensions.cs b/ShareX.HelpersLib/Extensions/NumberExtensions.cs
similarity index 100%
rename from HelpersLib/Extensions/NumberExtensions.cs
rename to ShareX.HelpersLib/Extensions/NumberExtensions.cs
diff --git a/HelpersLib/Extensions/ObjectExtensions.cs b/ShareX.HelpersLib/Extensions/ObjectExtensions.cs
similarity index 100%
rename from HelpersLib/Extensions/ObjectExtensions.cs
rename to ShareX.HelpersLib/Extensions/ObjectExtensions.cs
diff --git a/HelpersLib/Extensions/StreamExtensions.cs b/ShareX.HelpersLib/Extensions/StreamExtensions.cs
similarity index 100%
rename from HelpersLib/Extensions/StreamExtensions.cs
rename to ShareX.HelpersLib/Extensions/StreamExtensions.cs
diff --git a/HelpersLib/Extensions/StringExtensions.cs b/ShareX.HelpersLib/Extensions/StringExtensions.cs
similarity index 100%
rename from HelpersLib/Extensions/StringExtensions.cs
rename to ShareX.HelpersLib/Extensions/StringExtensions.cs
diff --git a/HelpersLib/Extensions/XMLExtensions.cs b/ShareX.HelpersLib/Extensions/XMLExtensions.cs
similarity index 100%
rename from HelpersLib/Extensions/XMLExtensions.cs
rename to ShareX.HelpersLib/Extensions/XMLExtensions.cs
diff --git a/HelpersLib/ExternalProgram.cs b/ShareX.HelpersLib/ExternalProgram.cs
similarity index 100%
rename from HelpersLib/ExternalProgram.cs
rename to ShareX.HelpersLib/ExternalProgram.cs
diff --git a/HelpersLib/FFmpegDownloader.cs b/ShareX.HelpersLib/FFmpegDownloader.cs
similarity index 100%
rename from HelpersLib/FFmpegDownloader.cs
rename to ShareX.HelpersLib/FFmpegDownloader.cs
diff --git a/HelpersLib/FastDateTime.cs b/ShareX.HelpersLib/FastDateTime.cs
similarity index 100%
rename from HelpersLib/FastDateTime.cs
rename to ShareX.HelpersLib/FastDateTime.cs
diff --git a/HelpersLib/FileDownloader.cs b/ShareX.HelpersLib/FileDownloader.cs
similarity index 100%
rename from HelpersLib/FileDownloader.cs
rename to ShareX.HelpersLib/FileDownloader.cs
diff --git a/HelpersLib/FixedSizedQueue.cs b/ShareX.HelpersLib/FixedSizedQueue.cs
similarity index 100%
rename from HelpersLib/FixedSizedQueue.cs
rename to ShareX.HelpersLib/FixedSizedQueue.cs
diff --git a/HelpersLib/FontSafe.cs b/ShareX.HelpersLib/FontSafe.cs
similarity index 100%
rename from HelpersLib/FontSafe.cs
rename to ShareX.HelpersLib/FontSafe.cs
diff --git a/HelpersLib/Forms/ClipboardContentViewer.Designer.cs b/ShareX.HelpersLib/Forms/ClipboardContentViewer.Designer.cs
similarity index 100%
rename from HelpersLib/Forms/ClipboardContentViewer.Designer.cs
rename to ShareX.HelpersLib/Forms/ClipboardContentViewer.Designer.cs
diff --git a/HelpersLib/Forms/ClipboardContentViewer.cs b/ShareX.HelpersLib/Forms/ClipboardContentViewer.cs
similarity index 100%
rename from HelpersLib/Forms/ClipboardContentViewer.cs
rename to ShareX.HelpersLib/Forms/ClipboardContentViewer.cs
diff --git a/HelpersLib/Forms/ClipboardContentViewer.resx b/ShareX.HelpersLib/Forms/ClipboardContentViewer.resx
similarity index 100%
rename from HelpersLib/Forms/ClipboardContentViewer.resx
rename to ShareX.HelpersLib/Forms/ClipboardContentViewer.resx
diff --git a/HelpersLib/Forms/ClipboardContentViewer.tr.resx b/ShareX.HelpersLib/Forms/ClipboardContentViewer.tr.resx
similarity index 100%
rename from HelpersLib/Forms/ClipboardContentViewer.tr.resx
rename to ShareX.HelpersLib/Forms/ClipboardContentViewer.tr.resx
diff --git a/HelpersLib/Forms/DebugForm.Designer.cs b/ShareX.HelpersLib/Forms/DebugForm.Designer.cs
similarity index 100%
rename from HelpersLib/Forms/DebugForm.Designer.cs
rename to ShareX.HelpersLib/Forms/DebugForm.Designer.cs
diff --git a/HelpersLib/Forms/DebugForm.cs b/ShareX.HelpersLib/Forms/DebugForm.cs
similarity index 100%
rename from HelpersLib/Forms/DebugForm.cs
rename to ShareX.HelpersLib/Forms/DebugForm.cs
diff --git a/HelpersLib/Forms/DebugForm.resx b/ShareX.HelpersLib/Forms/DebugForm.resx
similarity index 100%
rename from HelpersLib/Forms/DebugForm.resx
rename to ShareX.HelpersLib/Forms/DebugForm.resx
diff --git a/HelpersLib/Forms/DebugForm.tr.resx b/ShareX.HelpersLib/Forms/DebugForm.tr.resx
similarity index 100%
rename from HelpersLib/Forms/DebugForm.tr.resx
rename to ShareX.HelpersLib/Forms/DebugForm.tr.resx
diff --git a/HelpersLib/Forms/ErrorForm.Designer.cs b/ShareX.HelpersLib/Forms/ErrorForm.Designer.cs
similarity index 100%
rename from HelpersLib/Forms/ErrorForm.Designer.cs
rename to ShareX.HelpersLib/Forms/ErrorForm.Designer.cs
diff --git a/HelpersLib/Forms/ErrorForm.cs b/ShareX.HelpersLib/Forms/ErrorForm.cs
similarity index 100%
rename from HelpersLib/Forms/ErrorForm.cs
rename to ShareX.HelpersLib/Forms/ErrorForm.cs
diff --git a/HelpersLib/Forms/ErrorForm.resx b/ShareX.HelpersLib/Forms/ErrorForm.resx
similarity index 100%
rename from HelpersLib/Forms/ErrorForm.resx
rename to ShareX.HelpersLib/Forms/ErrorForm.resx
diff --git a/HelpersLib/Forms/ErrorForm.tr.resx b/ShareX.HelpersLib/Forms/ErrorForm.tr.resx
similarity index 100%
rename from HelpersLib/Forms/ErrorForm.tr.resx
rename to ShareX.HelpersLib/Forms/ErrorForm.tr.resx
diff --git a/HelpersLib/Forms/HashCheckForm.Designer.cs b/ShareX.HelpersLib/Forms/HashCheckForm.Designer.cs
similarity index 100%
rename from HelpersLib/Forms/HashCheckForm.Designer.cs
rename to ShareX.HelpersLib/Forms/HashCheckForm.Designer.cs
diff --git a/HelpersLib/Forms/HashCheckForm.cs b/ShareX.HelpersLib/Forms/HashCheckForm.cs
similarity index 100%
rename from HelpersLib/Forms/HashCheckForm.cs
rename to ShareX.HelpersLib/Forms/HashCheckForm.cs
diff --git a/HelpersLib/Forms/HashCheckForm.resx b/ShareX.HelpersLib/Forms/HashCheckForm.resx
similarity index 100%
rename from HelpersLib/Forms/HashCheckForm.resx
rename to ShareX.HelpersLib/Forms/HashCheckForm.resx
diff --git a/HelpersLib/Forms/HashCheckForm.tr.resx b/ShareX.HelpersLib/Forms/HashCheckForm.tr.resx
similarity index 100%
rename from HelpersLib/Forms/HashCheckForm.tr.resx
rename to ShareX.HelpersLib/Forms/HashCheckForm.tr.resx
diff --git a/HelpersLib/Forms/ImageViewer.cs b/ShareX.HelpersLib/Forms/ImageViewer.cs
similarity index 100%
rename from HelpersLib/Forms/ImageViewer.cs
rename to ShareX.HelpersLib/Forms/ImageViewer.cs
diff --git a/HelpersLib/Forms/InputBox.cs b/ShareX.HelpersLib/Forms/InputBox.cs
similarity index 100%
rename from HelpersLib/Forms/InputBox.cs
rename to ShareX.HelpersLib/Forms/InputBox.cs
diff --git a/HelpersLib/Forms/InputBox.resx b/ShareX.HelpersLib/Forms/InputBox.resx
similarity index 100%
rename from HelpersLib/Forms/InputBox.resx
rename to ShareX.HelpersLib/Forms/InputBox.resx
diff --git a/HelpersLib/Forms/InputBox.tr.resx b/ShareX.HelpersLib/Forms/InputBox.tr.resx
similarity index 100%
rename from HelpersLib/Forms/InputBox.tr.resx
rename to ShareX.HelpersLib/Forms/InputBox.tr.resx
diff --git a/HelpersLib/Forms/MonitorTestForm.Designer.cs b/ShareX.HelpersLib/Forms/MonitorTestForm.Designer.cs
similarity index 100%
rename from HelpersLib/Forms/MonitorTestForm.Designer.cs
rename to ShareX.HelpersLib/Forms/MonitorTestForm.Designer.cs
diff --git a/HelpersLib/Forms/MonitorTestForm.cs b/ShareX.HelpersLib/Forms/MonitorTestForm.cs
similarity index 100%
rename from HelpersLib/Forms/MonitorTestForm.cs
rename to ShareX.HelpersLib/Forms/MonitorTestForm.cs
diff --git a/HelpersLib/Forms/MonitorTestForm.resx b/ShareX.HelpersLib/Forms/MonitorTestForm.resx
similarity index 100%
rename from HelpersLib/Forms/MonitorTestForm.resx
rename to ShareX.HelpersLib/Forms/MonitorTestForm.resx
diff --git a/HelpersLib/Forms/MonitorTestForm.tr.resx b/ShareX.HelpersLib/Forms/MonitorTestForm.tr.resx
similarity index 100%
rename from HelpersLib/Forms/MonitorTestForm.tr.resx
rename to ShareX.HelpersLib/Forms/MonitorTestForm.tr.resx
diff --git a/HelpersLib/Forms/MyMessageBox.cs b/ShareX.HelpersLib/Forms/MyMessageBox.cs
similarity index 100%
rename from HelpersLib/Forms/MyMessageBox.cs
rename to ShareX.HelpersLib/Forms/MyMessageBox.cs
diff --git a/HelpersLib/Forms/OutputBox.Designer.cs b/ShareX.HelpersLib/Forms/OutputBox.Designer.cs
similarity index 100%
rename from HelpersLib/Forms/OutputBox.Designer.cs
rename to ShareX.HelpersLib/Forms/OutputBox.Designer.cs
diff --git a/HelpersLib/Forms/OutputBox.cs b/ShareX.HelpersLib/Forms/OutputBox.cs
similarity index 100%
rename from HelpersLib/Forms/OutputBox.cs
rename to ShareX.HelpersLib/Forms/OutputBox.cs
diff --git a/HelpersLib/Forms/OutputBox.resx b/ShareX.HelpersLib/Forms/OutputBox.resx
similarity index 100%
rename from HelpersLib/Forms/OutputBox.resx
rename to ShareX.HelpersLib/Forms/OutputBox.resx
diff --git a/HelpersLib/Forms/QRCodeForm.Designer.cs b/ShareX.HelpersLib/Forms/QRCodeForm.Designer.cs
similarity index 100%
rename from HelpersLib/Forms/QRCodeForm.Designer.cs
rename to ShareX.HelpersLib/Forms/QRCodeForm.Designer.cs
diff --git a/HelpersLib/Forms/QRCodeForm.cs b/ShareX.HelpersLib/Forms/QRCodeForm.cs
similarity index 100%
rename from HelpersLib/Forms/QRCodeForm.cs
rename to ShareX.HelpersLib/Forms/QRCodeForm.cs
diff --git a/HelpersLib/Forms/QRCodeForm.resx b/ShareX.HelpersLib/Forms/QRCodeForm.resx
similarity index 100%
rename from HelpersLib/Forms/QRCodeForm.resx
rename to ShareX.HelpersLib/Forms/QRCodeForm.resx
diff --git a/HelpersLib/Forms/QRCodeForm.tr.resx b/ShareX.HelpersLib/Forms/QRCodeForm.tr.resx
similarity index 100%
rename from HelpersLib/Forms/QRCodeForm.tr.resx
rename to ShareX.HelpersLib/Forms/QRCodeForm.tr.resx
diff --git a/HelpersLib/Forms/TrayForm.cs b/ShareX.HelpersLib/Forms/TrayForm.cs
similarity index 100%
rename from HelpersLib/Forms/TrayForm.cs
rename to ShareX.HelpersLib/Forms/TrayForm.cs
diff --git a/HelpersLib/GIF/AnimatedGifCreator.cs b/ShareX.HelpersLib/GIF/AnimatedGifCreator.cs
similarity index 100%
rename from HelpersLib/GIF/AnimatedGifCreator.cs
rename to ShareX.HelpersLib/GIF/AnimatedGifCreator.cs
diff --git a/HelpersLib/GIF/GifClass.cs b/ShareX.HelpersLib/GIF/GifClass.cs
similarity index 100%
rename from HelpersLib/GIF/GifClass.cs
rename to ShareX.HelpersLib/GIF/GifClass.cs
diff --git a/HelpersLib/GIF/GrayscaleQuantizer.cs b/ShareX.HelpersLib/GIF/GrayscaleQuantizer.cs
similarity index 100%
rename from HelpersLib/GIF/GrayscaleQuantizer.cs
rename to ShareX.HelpersLib/GIF/GrayscaleQuantizer.cs
diff --git a/HelpersLib/GIF/OctreeQuantizer.cs b/ShareX.HelpersLib/GIF/OctreeQuantizer.cs
similarity index 100%
rename from HelpersLib/GIF/OctreeQuantizer.cs
rename to ShareX.HelpersLib/GIF/OctreeQuantizer.cs
diff --git a/HelpersLib/GIF/PaletteQuantizer.cs b/ShareX.HelpersLib/GIF/PaletteQuantizer.cs
similarity index 100%
rename from HelpersLib/GIF/PaletteQuantizer.cs
rename to ShareX.HelpersLib/GIF/PaletteQuantizer.cs
diff --git a/HelpersLib/GIF/Quantizer.cs b/ShareX.HelpersLib/GIF/Quantizer.cs
similarity index 100%
rename from HelpersLib/GIF/Quantizer.cs
rename to ShareX.HelpersLib/GIF/Quantizer.cs
diff --git a/HelpersLib/Helpers/CaptureHelpers.cs b/ShareX.HelpersLib/Helpers/CaptureHelpers.cs
similarity index 100%
rename from HelpersLib/Helpers/CaptureHelpers.cs
rename to ShareX.HelpersLib/Helpers/CaptureHelpers.cs
diff --git a/HelpersLib/Helpers/ClipboardHelpers.cs b/ShareX.HelpersLib/Helpers/ClipboardHelpers.cs
similarity index 100%
rename from HelpersLib/Helpers/ClipboardHelpers.cs
rename to ShareX.HelpersLib/Helpers/ClipboardHelpers.cs
diff --git a/HelpersLib/Helpers/ColorHelpers.cs b/ShareX.HelpersLib/Helpers/ColorHelpers.cs
similarity index 100%
rename from HelpersLib/Helpers/ColorHelpers.cs
rename to ShareX.HelpersLib/Helpers/ColorHelpers.cs
diff --git a/HelpersLib/Helpers/Helpers.cs b/ShareX.HelpersLib/Helpers/Helpers.cs
similarity index 100%
rename from HelpersLib/Helpers/Helpers.cs
rename to ShareX.HelpersLib/Helpers/Helpers.cs
diff --git a/HelpersLib/Helpers/ImageHelpers.cs b/ShareX.HelpersLib/Helpers/ImageHelpers.cs
similarity index 100%
rename from HelpersLib/Helpers/ImageHelpers.cs
rename to ShareX.HelpersLib/Helpers/ImageHelpers.cs
diff --git a/HelpersLib/Helpers/MathHelpers.cs b/ShareX.HelpersLib/Helpers/MathHelpers.cs
similarity index 100%
rename from HelpersLib/Helpers/MathHelpers.cs
rename to ShareX.HelpersLib/Helpers/MathHelpers.cs
diff --git a/HelpersLib/Helpers/RegistryHelpers.cs b/ShareX.HelpersLib/Helpers/RegistryHelpers.cs
similarity index 100%
rename from HelpersLib/Helpers/RegistryHelpers.cs
rename to ShareX.HelpersLib/Helpers/RegistryHelpers.cs
diff --git a/HelpersLib/Helpers/SSLBypassHelper.cs b/ShareX.HelpersLib/Helpers/SSLBypassHelper.cs
similarity index 100%
rename from HelpersLib/Helpers/SSLBypassHelper.cs
rename to ShareX.HelpersLib/Helpers/SSLBypassHelper.cs
diff --git a/HelpersLib/Helpers/ShortcutHelpers.cs b/ShareX.HelpersLib/Helpers/ShortcutHelpers.cs
similarity index 100%
rename from HelpersLib/Helpers/ShortcutHelpers.cs
rename to ShareX.HelpersLib/Helpers/ShortcutHelpers.cs
diff --git a/HelpersLib/Helpers/URLHelpers.cs b/ShareX.HelpersLib/Helpers/URLHelpers.cs
similarity index 100%
rename from HelpersLib/Helpers/URLHelpers.cs
rename to ShareX.HelpersLib/Helpers/URLHelpers.cs
diff --git a/HelpersLib/HelpersLib.csproj.DotSettings b/ShareX.HelpersLib/HelpersLib.csproj.DotSettings
similarity index 100%
rename from HelpersLib/HelpersLib.csproj.DotSettings
rename to ShareX.HelpersLib/HelpersLib.csproj.DotSettings
diff --git a/HelpersLib/Links.cs b/ShareX.HelpersLib/Links.cs
similarity index 100%
rename from HelpersLib/Links.cs
rename to ShareX.HelpersLib/Links.cs
diff --git a/HelpersLib/ListViewColumnSorter.cs b/ShareX.HelpersLib/ListViewColumnSorter.cs
similarity index 100%
rename from HelpersLib/ListViewColumnSorter.cs
rename to ShareX.HelpersLib/ListViewColumnSorter.cs
diff --git a/HelpersLib/Logger.cs b/ShareX.HelpersLib/Logger.cs
similarity index 100%
rename from HelpersLib/Logger.cs
rename to ShareX.HelpersLib/Logger.cs
diff --git a/HelpersLib/MimeTypes.cs b/ShareX.HelpersLib/MimeTypes.cs
similarity index 100%
rename from HelpersLib/MimeTypes.cs
rename to ShareX.HelpersLib/MimeTypes.cs
diff --git a/HelpersLib/NameParser.cs b/ShareX.HelpersLib/NameParser.cs
similarity index 100%
rename from HelpersLib/NameParser.cs
rename to ShareX.HelpersLib/NameParser.cs
diff --git a/HelpersLib/Native/FolderSelectDialog.cs b/ShareX.HelpersLib/Native/FolderSelectDialog.cs
similarity index 100%
rename from HelpersLib/Native/FolderSelectDialog.cs
rename to ShareX.HelpersLib/Native/FolderSelectDialog.cs
diff --git a/HelpersLib/Native/LayeredForm.cs b/ShareX.HelpersLib/Native/LayeredForm.cs
similarity index 100%
rename from HelpersLib/Native/LayeredForm.cs
rename to ShareX.HelpersLib/Native/LayeredForm.cs
diff --git a/HelpersLib/Native/NativeConstants.cs b/ShareX.HelpersLib/Native/NativeConstants.cs
similarity index 100%
rename from HelpersLib/Native/NativeConstants.cs
rename to ShareX.HelpersLib/Native/NativeConstants.cs
diff --git a/HelpersLib/Native/NativeEnums.cs b/ShareX.HelpersLib/Native/NativeEnums.cs
similarity index 100%
rename from HelpersLib/Native/NativeEnums.cs
rename to ShareX.HelpersLib/Native/NativeEnums.cs
diff --git a/HelpersLib/Native/NativeMethods.cs b/ShareX.HelpersLib/Native/NativeMethods.cs
similarity index 100%
rename from HelpersLib/Native/NativeMethods.cs
rename to ShareX.HelpersLib/Native/NativeMethods.cs
diff --git a/HelpersLib/Native/NativeMethods_Helpers.cs b/ShareX.HelpersLib/Native/NativeMethods_Helpers.cs
similarity index 100%
rename from HelpersLib/Native/NativeMethods_Helpers.cs
rename to ShareX.HelpersLib/Native/NativeMethods_Helpers.cs
diff --git a/HelpersLib/Native/NativeStructs.cs b/ShareX.HelpersLib/Native/NativeStructs.cs
similarity index 100%
rename from HelpersLib/Native/NativeStructs.cs
rename to ShareX.HelpersLib/Native/NativeStructs.cs
diff --git a/HelpersLib/Native/TaskbarManager.cs b/ShareX.HelpersLib/Native/TaskbarManager.cs
similarity index 100%
rename from HelpersLib/Native/TaskbarManager.cs
rename to ShareX.HelpersLib/Native/TaskbarManager.cs
diff --git a/HelpersLib/PingHelper.cs b/ShareX.HelpersLib/PingHelper.cs
similarity index 100%
rename from HelpersLib/PingHelper.cs
rename to ShareX.HelpersLib/PingHelper.cs
diff --git a/HelpersLib/PingResult.cs b/ShareX.HelpersLib/PingResult.cs
similarity index 100%
rename from HelpersLib/PingResult.cs
rename to ShareX.HelpersLib/PingResult.cs
diff --git a/HelpersLib/Printer/PrintForm.Designer.cs b/ShareX.HelpersLib/Printer/PrintForm.Designer.cs
similarity index 100%
rename from HelpersLib/Printer/PrintForm.Designer.cs
rename to ShareX.HelpersLib/Printer/PrintForm.Designer.cs
diff --git a/HelpersLib/Printer/PrintForm.cs b/ShareX.HelpersLib/Printer/PrintForm.cs
similarity index 100%
rename from HelpersLib/Printer/PrintForm.cs
rename to ShareX.HelpersLib/Printer/PrintForm.cs
diff --git a/HelpersLib/Printer/PrintForm.resx b/ShareX.HelpersLib/Printer/PrintForm.resx
similarity index 100%
rename from HelpersLib/Printer/PrintForm.resx
rename to ShareX.HelpersLib/Printer/PrintForm.resx
diff --git a/HelpersLib/Printer/PrintForm.tr.resx b/ShareX.HelpersLib/Printer/PrintForm.tr.resx
similarity index 100%
rename from HelpersLib/Printer/PrintForm.tr.resx
rename to ShareX.HelpersLib/Printer/PrintForm.tr.resx
diff --git a/HelpersLib/Printer/PrintHelper.cs b/ShareX.HelpersLib/Printer/PrintHelper.cs
similarity index 100%
rename from HelpersLib/Printer/PrintHelper.cs
rename to ShareX.HelpersLib/Printer/PrintHelper.cs
diff --git a/HelpersLib/Printer/PrintSettings.cs b/ShareX.HelpersLib/Printer/PrintSettings.cs
similarity index 100%
rename from HelpersLib/Printer/PrintSettings.cs
rename to ShareX.HelpersLib/Printer/PrintSettings.cs
diff --git a/HelpersLib/Printer/PrintTextForm.Designer.cs b/ShareX.HelpersLib/Printer/PrintTextForm.Designer.cs
similarity index 100%
rename from HelpersLib/Printer/PrintTextForm.Designer.cs
rename to ShareX.HelpersLib/Printer/PrintTextForm.Designer.cs
diff --git a/HelpersLib/Printer/PrintTextForm.cs b/ShareX.HelpersLib/Printer/PrintTextForm.cs
similarity index 100%
rename from HelpersLib/Printer/PrintTextForm.cs
rename to ShareX.HelpersLib/Printer/PrintTextForm.cs
diff --git a/HelpersLib/Printer/PrintTextForm.resx b/ShareX.HelpersLib/Printer/PrintTextForm.resx
similarity index 100%
rename from HelpersLib/Printer/PrintTextForm.resx
rename to ShareX.HelpersLib/Printer/PrintTextForm.resx
diff --git a/HelpersLib/Printer/PrintTextForm.tr.resx b/ShareX.HelpersLib/Printer/PrintTextForm.tr.resx
similarity index 100%
rename from HelpersLib/Printer/PrintTextForm.tr.resx
rename to ShareX.HelpersLib/Printer/PrintTextForm.tr.resx
diff --git a/HelpersLib/Printer/PrintTextHelper.cs b/ShareX.HelpersLib/Printer/PrintTextHelper.cs
similarity index 100%
rename from HelpersLib/Printer/PrintTextHelper.cs
rename to ShareX.HelpersLib/Printer/PrintTextHelper.cs
diff --git a/HelpersLib/Properties/AssemblyInfo.cs b/ShareX.HelpersLib/Properties/AssemblyInfo.cs
similarity index 85%
rename from HelpersLib/Properties/AssemblyInfo.cs
rename to ShareX.HelpersLib/Properties/AssemblyInfo.cs
index b26cb7865..e2ab9def5 100644
--- a/HelpersLib/Properties/AssemblyInfo.cs
+++ b/ShareX.HelpersLib/Properties/AssemblyInfo.cs
@@ -1,11 +1,11 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("HelpersLib")]
+[assembly: AssemblyTitle("ShareX HelpersLib")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("ShareX Developers")]
-[assembly: AssemblyProduct("HelpersLib")]
+[assembly: AssemblyProduct("ShareX")]
 [assembly: AssemblyCopyright("Copyright (C) 2007-2014 ShareX Developers")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/HelpersLib/Properties/Resources.Designer.cs b/ShareX.HelpersLib/Properties/Resources.Designer.cs
similarity index 100%
rename from HelpersLib/Properties/Resources.Designer.cs
rename to ShareX.HelpersLib/Properties/Resources.Designer.cs
diff --git a/HelpersLib/Properties/Resources.resx b/ShareX.HelpersLib/Properties/Resources.resx
similarity index 100%
rename from HelpersLib/Properties/Resources.resx
rename to ShareX.HelpersLib/Properties/Resources.resx
diff --git a/HelpersLib/Properties/Resources.tr.resx b/ShareX.HelpersLib/Properties/Resources.tr.resx
similarity index 100%
rename from HelpersLib/Properties/Resources.tr.resx
rename to ShareX.HelpersLib/Properties/Resources.tr.resx
diff --git a/HelpersLib/ProxyInfo.cs b/ShareX.HelpersLib/ProxyInfo.cs
similarity index 100%
rename from HelpersLib/ProxyInfo.cs
rename to ShareX.HelpersLib/ProxyInfo.cs
diff --git a/HelpersLib/Resources/Icon.png b/ShareX.HelpersLib/Resources/Icon.png
similarity index 100%
rename from HelpersLib/Resources/Icon.png
rename to ShareX.HelpersLib/Resources/Icon.png
diff --git a/HelpersLib/Resources/Loading.gif b/ShareX.HelpersLib/Resources/Loading.gif
similarity index 100%
rename from HelpersLib/Resources/Loading.gif
rename to ShareX.HelpersLib/Resources/Loading.gif
diff --git a/HelpersLib/Resources/ShareX_Icon.ico b/ShareX.HelpersLib/Resources/ShareX_Icon.ico
similarity index 100%
rename from HelpersLib/Resources/ShareX_Icon.ico
rename to ShareX.HelpersLib/Resources/ShareX_Icon.ico
diff --git a/HelpersLib/Resources/ShareX_Logo.png b/ShareX.HelpersLib/Resources/ShareX_Logo.png
similarity index 100%
rename from HelpersLib/Resources/ShareX_Logo.png
rename to ShareX.HelpersLib/Resources/ShareX_Logo.png
diff --git a/HelpersLib/Resources/ShareX_Logo_Black.png b/ShareX.HelpersLib/Resources/ShareX_Logo_Black.png
similarity index 100%
rename from HelpersLib/Resources/ShareX_Logo_Black.png
rename to ShareX.HelpersLib/Resources/ShareX_Logo_Black.png
diff --git a/HelpersLib/Resources/cross.png b/ShareX.HelpersLib/Resources/cross.png
similarity index 100%
rename from HelpersLib/Resources/cross.png
rename to ShareX.HelpersLib/Resources/cross.png
diff --git a/HelpersLib/Resources/crosshair.cur b/ShareX.HelpersLib/Resources/crosshair.cur
similarity index 100%
rename from HelpersLib/Resources/crosshair.cur
rename to ShareX.HelpersLib/Resources/crosshair.cur
diff --git a/HelpersLib/SettingsBase.cs b/ShareX.HelpersLib/SettingsBase.cs
similarity index 100%
rename from HelpersLib/SettingsBase.cs
rename to ShareX.HelpersLib/SettingsBase.cs
diff --git a/HelpersLib/SettingsHelper.cs b/ShareX.HelpersLib/SettingsHelper.cs
similarity index 100%
rename from HelpersLib/SettingsHelper.cs
rename to ShareX.HelpersLib/SettingsHelper.cs
diff --git a/HelpersLib/HelpersLib.csproj b/ShareX.HelpersLib/ShareX.HelpersLib.csproj
similarity index 99%
rename from HelpersLib/HelpersLib.csproj
rename to ShareX.HelpersLib/ShareX.HelpersLib.csproj
index 632be7d22..99224d5de 100644
--- a/HelpersLib/HelpersLib.csproj
+++ b/ShareX.HelpersLib/ShareX.HelpersLib.csproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>HelpersLib</RootNamespace>
-    <AssemblyName>HelpersLib</AssemblyName>
+    <AssemblyName>ShareX.HelpersLib</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <StartupObject>
@@ -497,9 +497,9 @@
     <None Include="Resources\Crosshair.cur" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\GreenshotImageEditor\GreenshotImageEditor.csproj">
+    <ProjectReference Include="..\Greenshot.ImageEditor\Greenshot.ImageEditor.csproj">
       <Project>{cd642bf4-d815-4d67-a0b5-c69f0b8231af}</Project>
-      <Name>GreenshotImageEditor</Name>
+      <Name>Greenshot.ImageEditor</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/ShareX.HelpersLib/ShareX.HelpersLib.csproj.DotSettings b/ShareX.HelpersLib/ShareX.HelpersLib.csproj.DotSettings
new file mode 100644
index 000000000..a99420329
--- /dev/null
+++ b/ShareX.HelpersLib/ShareX.HelpersLib.csproj.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeEditing/Localization/LocalizableInspector/@EntryValue">Pessimistic</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/HelpersLib/ShareXResources.cs b/ShareX.HelpersLib/ShareXResources.cs
similarity index 100%
rename from HelpersLib/ShareXResources.cs
rename to ShareX.HelpersLib/ShareXResources.cs
diff --git a/HelpersLib/SingleInstanceApplication/ApplicationInstanceManager.cs b/ShareX.HelpersLib/SingleInstanceApplication/ApplicationInstanceManager.cs
similarity index 100%
rename from HelpersLib/SingleInstanceApplication/ApplicationInstanceManager.cs
rename to ShareX.HelpersLib/SingleInstanceApplication/ApplicationInstanceManager.cs
diff --git a/HelpersLib/SingleInstanceApplication/InstanceProxy.cs b/ShareX.HelpersLib/SingleInstanceApplication/InstanceProxy.cs
similarity index 100%
rename from HelpersLib/SingleInstanceApplication/InstanceProxy.cs
rename to ShareX.HelpersLib/SingleInstanceApplication/InstanceProxy.cs
diff --git a/HelpersLib/StringLineReader.cs b/ShareX.HelpersLib/StringLineReader.cs
similarity index 100%
rename from HelpersLib/StringLineReader.cs
rename to ShareX.HelpersLib/StringLineReader.cs
diff --git a/HelpersLib/TaskEx.cs b/ShareX.HelpersLib/TaskEx.cs
similarity index 100%
rename from HelpersLib/TaskEx.cs
rename to ShareX.HelpersLib/TaskEx.cs
diff --git a/HelpersLib/TextBoxTraceListener.cs b/ShareX.HelpersLib/TextBoxTraceListener.cs
similarity index 100%
rename from HelpersLib/TextBoxTraceListener.cs
rename to ShareX.HelpersLib/TextBoxTraceListener.cs
diff --git a/HelpersLib/ThreadWorker.cs b/ShareX.HelpersLib/ThreadWorker.cs
similarity index 100%
rename from HelpersLib/ThreadWorker.cs
rename to ShareX.HelpersLib/ThreadWorker.cs
diff --git a/HelpersLib/Tokenizer/BetweenTagsResult.cs b/ShareX.HelpersLib/Tokenizer/BetweenTagsResult.cs
similarity index 100%
rename from HelpersLib/Tokenizer/BetweenTagsResult.cs
rename to ShareX.HelpersLib/Tokenizer/BetweenTagsResult.cs
diff --git a/HelpersLib/Tokenizer/Token.cs b/ShareX.HelpersLib/Tokenizer/Token.cs
similarity index 100%
rename from HelpersLib/Tokenizer/Token.cs
rename to ShareX.HelpersLib/Tokenizer/Token.cs
diff --git a/HelpersLib/Tokenizer/Tokenizer.cs b/ShareX.HelpersLib/Tokenizer/Tokenizer.cs
similarity index 100%
rename from HelpersLib/Tokenizer/Tokenizer.cs
rename to ShareX.HelpersLib/Tokenizer/Tokenizer.cs
diff --git a/HelpersLib/UITypeEditors/CssFileNameEditor.cs b/ShareX.HelpersLib/UITypeEditors/CssFileNameEditor.cs
similarity index 100%
rename from HelpersLib/UITypeEditors/CssFileNameEditor.cs
rename to ShareX.HelpersLib/UITypeEditors/CssFileNameEditor.cs
diff --git a/HelpersLib/UITypeEditors/DirectoryNameEditor.cs b/ShareX.HelpersLib/UITypeEditors/DirectoryNameEditor.cs
similarity index 100%
rename from HelpersLib/UITypeEditors/DirectoryNameEditor.cs
rename to ShareX.HelpersLib/UITypeEditors/DirectoryNameEditor.cs
diff --git a/HelpersLib/UITypeEditors/EnumDescriptionConverter.cs b/ShareX.HelpersLib/UITypeEditors/EnumDescriptionConverter.cs
similarity index 100%
rename from HelpersLib/UITypeEditors/EnumDescriptionConverter.cs
rename to ShareX.HelpersLib/UITypeEditors/EnumDescriptionConverter.cs
diff --git a/HelpersLib/UITypeEditors/ExeFileNameEditor.cs b/ShareX.HelpersLib/UITypeEditors/ExeFileNameEditor.cs
similarity index 100%
rename from HelpersLib/UITypeEditors/ExeFileNameEditor.cs
rename to ShareX.HelpersLib/UITypeEditors/ExeFileNameEditor.cs
diff --git a/HelpersLib/UITypeEditors/GradientEditor.cs b/ShareX.HelpersLib/UITypeEditors/GradientEditor.cs
similarity index 100%
rename from HelpersLib/UITypeEditors/GradientEditor.cs
rename to ShareX.HelpersLib/UITypeEditors/GradientEditor.cs
diff --git a/HelpersLib/UITypeEditors/ImageFileNameEditor.cs b/ShareX.HelpersLib/UITypeEditors/ImageFileNameEditor.cs
similarity index 100%
rename from HelpersLib/UITypeEditors/ImageFileNameEditor.cs
rename to ShareX.HelpersLib/UITypeEditors/ImageFileNameEditor.cs
diff --git a/HelpersLib/UITypeEditors/JsonFileNameEditor.cs b/ShareX.HelpersLib/UITypeEditors/JsonFileNameEditor.cs
similarity index 100%
rename from HelpersLib/UITypeEditors/JsonFileNameEditor.cs
rename to ShareX.HelpersLib/UITypeEditors/JsonFileNameEditor.cs
diff --git a/HelpersLib/UITypeEditors/MyColorConverter.cs b/ShareX.HelpersLib/UITypeEditors/MyColorConverter.cs
similarity index 100%
rename from HelpersLib/UITypeEditors/MyColorConverter.cs
rename to ShareX.HelpersLib/UITypeEditors/MyColorConverter.cs
diff --git a/HelpersLib/UITypeEditors/MyColorEditor.cs b/ShareX.HelpersLib/UITypeEditors/MyColorEditor.cs
similarity index 100%
rename from HelpersLib/UITypeEditors/MyColorEditor.cs
rename to ShareX.HelpersLib/UITypeEditors/MyColorEditor.cs
diff --git a/HelpersLib/UITypeEditors/NameParserEditor.cs b/ShareX.HelpersLib/UITypeEditors/NameParserEditor.cs
similarity index 100%
rename from HelpersLib/UITypeEditors/NameParserEditor.cs
rename to ShareX.HelpersLib/UITypeEditors/NameParserEditor.cs
diff --git a/HelpersLib/UnsafeBitmap.cs b/ShareX.HelpersLib/UnsafeBitmap.cs
similarity index 100%
rename from HelpersLib/UnsafeBitmap.cs
rename to ShareX.HelpersLib/UnsafeBitmap.cs
diff --git a/HelpersLib/UpdateChecker/DownloaderForm.Designer.cs b/ShareX.HelpersLib/UpdateChecker/DownloaderForm.Designer.cs
similarity index 100%
rename from HelpersLib/UpdateChecker/DownloaderForm.Designer.cs
rename to ShareX.HelpersLib/UpdateChecker/DownloaderForm.Designer.cs
diff --git a/HelpersLib/UpdateChecker/DownloaderForm.cs b/ShareX.HelpersLib/UpdateChecker/DownloaderForm.cs
similarity index 100%
rename from HelpersLib/UpdateChecker/DownloaderForm.cs
rename to ShareX.HelpersLib/UpdateChecker/DownloaderForm.cs
diff --git a/HelpersLib/UpdateChecker/DownloaderForm.resx b/ShareX.HelpersLib/UpdateChecker/DownloaderForm.resx
similarity index 100%
rename from HelpersLib/UpdateChecker/DownloaderForm.resx
rename to ShareX.HelpersLib/UpdateChecker/DownloaderForm.resx
diff --git a/HelpersLib/UpdateChecker/DownloaderForm.tr.resx b/ShareX.HelpersLib/UpdateChecker/DownloaderForm.tr.resx
similarity index 100%
rename from HelpersLib/UpdateChecker/DownloaderForm.tr.resx
rename to ShareX.HelpersLib/UpdateChecker/DownloaderForm.tr.resx
diff --git a/HelpersLib/UpdateChecker/GitHubUpdateChecker.cs b/ShareX.HelpersLib/UpdateChecker/GitHubUpdateChecker.cs
similarity index 100%
rename from HelpersLib/UpdateChecker/GitHubUpdateChecker.cs
rename to ShareX.HelpersLib/UpdateChecker/GitHubUpdateChecker.cs
diff --git a/HelpersLib/UpdateChecker/UpdateChecker.cs b/ShareX.HelpersLib/UpdateChecker/UpdateChecker.cs
similarity index 100%
rename from HelpersLib/UpdateChecker/UpdateChecker.cs
rename to ShareX.HelpersLib/UpdateChecker/UpdateChecker.cs
diff --git a/HelpersLib/UpdateChecker/UpdateCheckerLabel.Designer.cs b/ShareX.HelpersLib/UpdateChecker/UpdateCheckerLabel.Designer.cs
similarity index 100%
rename from HelpersLib/UpdateChecker/UpdateCheckerLabel.Designer.cs
rename to ShareX.HelpersLib/UpdateChecker/UpdateCheckerLabel.Designer.cs
diff --git a/HelpersLib/UpdateChecker/UpdateCheckerLabel.cs b/ShareX.HelpersLib/UpdateChecker/UpdateCheckerLabel.cs
similarity index 100%
rename from HelpersLib/UpdateChecker/UpdateCheckerLabel.cs
rename to ShareX.HelpersLib/UpdateChecker/UpdateCheckerLabel.cs
diff --git a/HelpersLib/UpdateChecker/UpdateCheckerLabel.resx b/ShareX.HelpersLib/UpdateChecker/UpdateCheckerLabel.resx
similarity index 100%
rename from HelpersLib/UpdateChecker/UpdateCheckerLabel.resx
rename to ShareX.HelpersLib/UpdateChecker/UpdateCheckerLabel.resx
diff --git a/HelpersLib/UpdateChecker/UpdateCheckerLabel.tr.resx b/ShareX.HelpersLib/UpdateChecker/UpdateCheckerLabel.tr.resx
similarity index 100%
rename from HelpersLib/UpdateChecker/UpdateCheckerLabel.tr.resx
rename to ShareX.HelpersLib/UpdateChecker/UpdateCheckerLabel.tr.resx
diff --git a/HelpersLib/UpdateChecker/XMLUpdateChecker.cs b/ShareX.HelpersLib/UpdateChecker/XMLUpdateChecker.cs
similarity index 100%
rename from HelpersLib/UpdateChecker/XMLUpdateChecker.cs
rename to ShareX.HelpersLib/UpdateChecker/XMLUpdateChecker.cs
diff --git a/HelpersLib/Vector2.cs b/ShareX.HelpersLib/Vector2.cs
similarity index 100%
rename from HelpersLib/Vector2.cs
rename to ShareX.HelpersLib/Vector2.cs
diff --git a/HelpersLib/WindowState.cs b/ShareX.HelpersLib/WindowState.cs
similarity index 100%
rename from HelpersLib/WindowState.cs
rename to ShareX.HelpersLib/WindowState.cs
diff --git a/HelpersLib/XmlColor.cs b/ShareX.HelpersLib/XmlColor.cs
similarity index 100%
rename from HelpersLib/XmlColor.cs
rename to ShareX.HelpersLib/XmlColor.cs
diff --git a/HelpersLib/XmlFont.cs b/ShareX.HelpersLib/XmlFont.cs
similarity index 100%
rename from HelpersLib/XmlFont.cs
rename to ShareX.HelpersLib/XmlFont.cs
diff --git a/HelpersLib/packages.config b/ShareX.HelpersLib/packages.config
similarity index 100%
rename from HelpersLib/packages.config
rename to ShareX.HelpersLib/packages.config
diff --git a/HistoryLib/Enums.cs b/ShareX.HistoryLib/Enums.cs
similarity index 100%
rename from HistoryLib/Enums.cs
rename to ShareX.HistoryLib/Enums.cs
diff --git a/HistoryLib/HistoryForm.Designer.cs b/ShareX.HistoryLib/HistoryForm.Designer.cs
similarity index 100%
rename from HistoryLib/HistoryForm.Designer.cs
rename to ShareX.HistoryLib/HistoryForm.Designer.cs
diff --git a/HistoryLib/HistoryForm.cs b/ShareX.HistoryLib/HistoryForm.cs
similarity index 100%
rename from HistoryLib/HistoryForm.cs
rename to ShareX.HistoryLib/HistoryForm.cs
diff --git a/HistoryLib/HistoryForm.resx b/ShareX.HistoryLib/HistoryForm.resx
similarity index 100%
rename from HistoryLib/HistoryForm.resx
rename to ShareX.HistoryLib/HistoryForm.resx
diff --git a/HistoryLib/HistoryForm.tr.resx b/ShareX.HistoryLib/HistoryForm.tr.resx
similarity index 100%
rename from HistoryLib/HistoryForm.tr.resx
rename to ShareX.HistoryLib/HistoryForm.tr.resx
diff --git a/HistoryLib/HistoryItem.cs b/ShareX.HistoryLib/HistoryItem.cs
similarity index 100%
rename from HistoryLib/HistoryItem.cs
rename to ShareX.HistoryLib/HistoryItem.cs
diff --git a/HistoryLib/HistoryItemInfoForm.Designer.cs b/ShareX.HistoryLib/HistoryItemInfoForm.Designer.cs
similarity index 100%
rename from HistoryLib/HistoryItemInfoForm.Designer.cs
rename to ShareX.HistoryLib/HistoryItemInfoForm.Designer.cs
diff --git a/HistoryLib/HistoryItemInfoForm.cs b/ShareX.HistoryLib/HistoryItemInfoForm.cs
similarity index 100%
rename from HistoryLib/HistoryItemInfoForm.cs
rename to ShareX.HistoryLib/HistoryItemInfoForm.cs
diff --git a/HistoryLib/HistoryItemInfoForm.resx b/ShareX.HistoryLib/HistoryItemInfoForm.resx
similarity index 100%
rename from HistoryLib/HistoryItemInfoForm.resx
rename to ShareX.HistoryLib/HistoryItemInfoForm.resx
diff --git a/HistoryLib/HistoryItemInfoForm.tr.resx b/ShareX.HistoryLib/HistoryItemInfoForm.tr.resx
similarity index 100%
rename from HistoryLib/HistoryItemInfoForm.tr.resx
rename to ShareX.HistoryLib/HistoryItemInfoForm.tr.resx
diff --git a/HistoryLib/HistoryItemManager.cs b/ShareX.HistoryLib/HistoryItemManager.cs
similarity index 100%
rename from HistoryLib/HistoryItemManager.cs
rename to ShareX.HistoryLib/HistoryItemManager.cs
diff --git a/HistoryLib/HistoryItemManager_ContextMenu.cs b/ShareX.HistoryLib/HistoryItemManager_ContextMenu.cs
similarity index 100%
rename from HistoryLib/HistoryItemManager_ContextMenu.cs
rename to ShareX.HistoryLib/HistoryItemManager_ContextMenu.cs
diff --git a/HistoryLib/HistoryItemOld.cs b/ShareX.HistoryLib/HistoryItemOld.cs
similarity index 100%
rename from HistoryLib/HistoryItemOld.cs
rename to ShareX.HistoryLib/HistoryItemOld.cs
diff --git a/HistoryLib/HistoryLib.csproj.DotSettings b/ShareX.HistoryLib/HistoryLib.csproj.DotSettings
similarity index 100%
rename from HistoryLib/HistoryLib.csproj.DotSettings
rename to ShareX.HistoryLib/HistoryLib.csproj.DotSettings
diff --git a/HistoryLib/HistoryManager.cs b/ShareX.HistoryLib/HistoryManager.cs
similarity index 100%
rename from HistoryLib/HistoryManager.cs
rename to ShareX.HistoryLib/HistoryManager.cs
diff --git a/HistoryLib/ImageHistoryForm.Designer.cs b/ShareX.HistoryLib/ImageHistoryForm.Designer.cs
similarity index 100%
rename from HistoryLib/ImageHistoryForm.Designer.cs
rename to ShareX.HistoryLib/ImageHistoryForm.Designer.cs
diff --git a/HistoryLib/ImageHistoryForm.cs b/ShareX.HistoryLib/ImageHistoryForm.cs
similarity index 100%
rename from HistoryLib/ImageHistoryForm.cs
rename to ShareX.HistoryLib/ImageHistoryForm.cs
diff --git a/HistoryLib/ImageHistoryForm.resx b/ShareX.HistoryLib/ImageHistoryForm.resx
similarity index 100%
rename from HistoryLib/ImageHistoryForm.resx
rename to ShareX.HistoryLib/ImageHistoryForm.resx
diff --git a/HistoryLib/ImageHistoryForm.tr.resx b/ShareX.HistoryLib/ImageHistoryForm.tr.resx
similarity index 100%
rename from HistoryLib/ImageHistoryForm.tr.resx
rename to ShareX.HistoryLib/ImageHistoryForm.tr.resx
diff --git a/HistoryLib/Properties/AssemblyInfo.cs b/ShareX.HistoryLib/Properties/AssemblyInfo.cs
similarity index 85%
rename from HistoryLib/Properties/AssemblyInfo.cs
rename to ShareX.HistoryLib/Properties/AssemblyInfo.cs
index 7e8a43695..d5a2b2bf9 100644
--- a/HistoryLib/Properties/AssemblyInfo.cs
+++ b/ShareX.HistoryLib/Properties/AssemblyInfo.cs
@@ -1,11 +1,11 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("HistoryLib")]
+[assembly: AssemblyTitle("ShareX HistoryLib")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("ShareX Developers")]
-[assembly: AssemblyProduct("HistoryLib")]
+[assembly: AssemblyProduct("ShareX")]
 [assembly: AssemblyCopyright("Copyright (C) 2007-2014 ShareX Developers")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/HistoryLib/Properties/Resources.Designer.cs b/ShareX.HistoryLib/Properties/Resources.Designer.cs
similarity index 100%
rename from HistoryLib/Properties/Resources.Designer.cs
rename to ShareX.HistoryLib/Properties/Resources.Designer.cs
diff --git a/HistoryLib/Properties/Resources.resx b/ShareX.HistoryLib/Properties/Resources.resx
similarity index 100%
rename from HistoryLib/Properties/Resources.resx
rename to ShareX.HistoryLib/Properties/Resources.resx
diff --git a/HistoryLib/Properties/Resources.tr.resx b/ShareX.HistoryLib/Properties/Resources.tr.resx
similarity index 100%
rename from HistoryLib/Properties/Resources.tr.resx
rename to ShareX.HistoryLib/Properties/Resources.tr.resx
diff --git a/HistoryLib/HistoryLib.csproj b/ShareX.HistoryLib/ShareX.HistoryLib.csproj
similarity index 97%
rename from HistoryLib/HistoryLib.csproj
rename to ShareX.HistoryLib/ShareX.HistoryLib.csproj
index a3384e95b..603dce8a2 100644
--- a/HistoryLib/HistoryLib.csproj
+++ b/ShareX.HistoryLib/ShareX.HistoryLib.csproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>HistoryLib</RootNamespace>
-    <AssemblyName>HistoryLib</AssemblyName>
+    <AssemblyName>ShareX.HistoryLib</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -93,9 +93,9 @@
     <Compile Include="XMLManager.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\HelpersLib\HelpersLib.csproj">
+    <ProjectReference Include="..\ShareX.HelpersLib\ShareX.HelpersLib.csproj">
       <Project>{327750E1-9FB7-4CC3-8AEA-9BC42180CAD3}</Project>
-      <Name>HelpersLib</Name>
+      <Name>ShareX.HelpersLib</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/ShareX.HistoryLib/ShareX.HistoryLib.csproj.DotSettings b/ShareX.HistoryLib/ShareX.HistoryLib.csproj.DotSettings
new file mode 100644
index 000000000..a99420329
--- /dev/null
+++ b/ShareX.HistoryLib/ShareX.HistoryLib.csproj.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeEditing/Localization/LocalizableInspector/@EntryValue">Pessimistic</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/HistoryLib/UserControls/ObjectListView.cs b/ShareX.HistoryLib/UserControls/ObjectListView.cs
similarity index 100%
rename from HistoryLib/UserControls/ObjectListView.cs
rename to ShareX.HistoryLib/UserControls/ObjectListView.cs
diff --git a/HistoryLib/XMLManager.cs b/ShareX.HistoryLib/XMLManager.cs
similarity index 100%
rename from HistoryLib/XMLManager.cs
rename to ShareX.HistoryLib/XMLManager.cs
diff --git a/HistoryLib/XMLManagerOld.cs b/ShareX.HistoryLib/XMLManagerOld.cs
similarity index 100%
rename from HistoryLib/XMLManagerOld.cs
rename to ShareX.HistoryLib/XMLManagerOld.cs
diff --git a/HistoryLib/packages.config b/ShareX.HistoryLib/packages.config
similarity index 100%
rename from HistoryLib/packages.config
rename to ShareX.HistoryLib/packages.config
diff --git a/ImageEffectsLib/Adjustments/Alpha.cs b/ShareX.ImageEffectsLib/Adjustments/Alpha.cs
similarity index 100%
rename from ImageEffectsLib/Adjustments/Alpha.cs
rename to ShareX.ImageEffectsLib/Adjustments/Alpha.cs
diff --git a/ImageEffectsLib/Adjustments/BlackWhite.cs b/ShareX.ImageEffectsLib/Adjustments/BlackWhite.cs
similarity index 100%
rename from ImageEffectsLib/Adjustments/BlackWhite.cs
rename to ShareX.ImageEffectsLib/Adjustments/BlackWhite.cs
diff --git a/ImageEffectsLib/Adjustments/Brightness.cs b/ShareX.ImageEffectsLib/Adjustments/Brightness.cs
similarity index 100%
rename from ImageEffectsLib/Adjustments/Brightness.cs
rename to ShareX.ImageEffectsLib/Adjustments/Brightness.cs
diff --git a/ImageEffectsLib/Adjustments/Colorize.cs b/ShareX.ImageEffectsLib/Adjustments/Colorize.cs
similarity index 100%
rename from ImageEffectsLib/Adjustments/Colorize.cs
rename to ShareX.ImageEffectsLib/Adjustments/Colorize.cs
diff --git a/ImageEffectsLib/Adjustments/Contrast.cs b/ShareX.ImageEffectsLib/Adjustments/Contrast.cs
similarity index 100%
rename from ImageEffectsLib/Adjustments/Contrast.cs
rename to ShareX.ImageEffectsLib/Adjustments/Contrast.cs
diff --git a/ImageEffectsLib/Adjustments/Gamma.cs b/ShareX.ImageEffectsLib/Adjustments/Gamma.cs
similarity index 100%
rename from ImageEffectsLib/Adjustments/Gamma.cs
rename to ShareX.ImageEffectsLib/Adjustments/Gamma.cs
diff --git a/ImageEffectsLib/Adjustments/Grayscale.cs b/ShareX.ImageEffectsLib/Adjustments/Grayscale.cs
similarity index 100%
rename from ImageEffectsLib/Adjustments/Grayscale.cs
rename to ShareX.ImageEffectsLib/Adjustments/Grayscale.cs
diff --git a/ImageEffectsLib/Adjustments/Hue.cs b/ShareX.ImageEffectsLib/Adjustments/Hue.cs
similarity index 100%
rename from ImageEffectsLib/Adjustments/Hue.cs
rename to ShareX.ImageEffectsLib/Adjustments/Hue.cs
diff --git a/ImageEffectsLib/Adjustments/Inverse.cs b/ShareX.ImageEffectsLib/Adjustments/Inverse.cs
similarity index 100%
rename from ImageEffectsLib/Adjustments/Inverse.cs
rename to ShareX.ImageEffectsLib/Adjustments/Inverse.cs
diff --git a/ImageEffectsLib/Adjustments/MatrixColor.cs b/ShareX.ImageEffectsLib/Adjustments/MatrixColor.cs
similarity index 100%
rename from ImageEffectsLib/Adjustments/MatrixColor.cs
rename to ShareX.ImageEffectsLib/Adjustments/MatrixColor.cs
diff --git a/ImageEffectsLib/Adjustments/Polaroid.cs b/ShareX.ImageEffectsLib/Adjustments/Polaroid.cs
similarity index 100%
rename from ImageEffectsLib/Adjustments/Polaroid.cs
rename to ShareX.ImageEffectsLib/Adjustments/Polaroid.cs
diff --git a/ImageEffectsLib/Adjustments/Saturation.cs b/ShareX.ImageEffectsLib/Adjustments/Saturation.cs
similarity index 100%
rename from ImageEffectsLib/Adjustments/Saturation.cs
rename to ShareX.ImageEffectsLib/Adjustments/Saturation.cs
diff --git a/ImageEffectsLib/Adjustments/Sepia.cs b/ShareX.ImageEffectsLib/Adjustments/Sepia.cs
similarity index 100%
rename from ImageEffectsLib/Adjustments/Sepia.cs
rename to ShareX.ImageEffectsLib/Adjustments/Sepia.cs
diff --git a/ImageEffectsLib/Drawings/DrawBackground.cs b/ShareX.ImageEffectsLib/Drawings/DrawBackground.cs
similarity index 100%
rename from ImageEffectsLib/Drawings/DrawBackground.cs
rename to ShareX.ImageEffectsLib/Drawings/DrawBackground.cs
diff --git a/ImageEffectsLib/Drawings/DrawBorder.cs b/ShareX.ImageEffectsLib/Drawings/DrawBorder.cs
similarity index 100%
rename from ImageEffectsLib/Drawings/DrawBorder.cs
rename to ShareX.ImageEffectsLib/Drawings/DrawBorder.cs
diff --git a/ImageEffectsLib/Drawings/DrawCheckerboard.cs b/ShareX.ImageEffectsLib/Drawings/DrawCheckerboard.cs
similarity index 100%
rename from ImageEffectsLib/Drawings/DrawCheckerboard.cs
rename to ShareX.ImageEffectsLib/Drawings/DrawCheckerboard.cs
diff --git a/ImageEffectsLib/Drawings/DrawImage.cs b/ShareX.ImageEffectsLib/Drawings/DrawImage.cs
similarity index 100%
rename from ImageEffectsLib/Drawings/DrawImage.cs
rename to ShareX.ImageEffectsLib/Drawings/DrawImage.cs
diff --git a/ImageEffectsLib/Drawings/DrawText.cs b/ShareX.ImageEffectsLib/Drawings/DrawText.cs
similarity index 100%
rename from ImageEffectsLib/Drawings/DrawText.cs
rename to ShareX.ImageEffectsLib/Drawings/DrawText.cs
diff --git a/ImageEffectsLib/Enums.cs b/ShareX.ImageEffectsLib/Enums.cs
similarity index 100%
rename from ImageEffectsLib/Enums.cs
rename to ShareX.ImageEffectsLib/Enums.cs
diff --git a/ImageEffectsLib/Filters/Blur.cs b/ShareX.ImageEffectsLib/Filters/Blur.cs
similarity index 100%
rename from ImageEffectsLib/Filters/Blur.cs
rename to ShareX.ImageEffectsLib/Filters/Blur.cs
diff --git a/ImageEffectsLib/Filters/EdgeDetect.cs b/ShareX.ImageEffectsLib/Filters/EdgeDetect.cs
similarity index 100%
rename from ImageEffectsLib/Filters/EdgeDetect.cs
rename to ShareX.ImageEffectsLib/Filters/EdgeDetect.cs
diff --git a/ImageEffectsLib/Filters/Emboss.cs b/ShareX.ImageEffectsLib/Filters/Emboss.cs
similarity index 100%
rename from ImageEffectsLib/Filters/Emboss.cs
rename to ShareX.ImageEffectsLib/Filters/Emboss.cs
diff --git a/ImageEffectsLib/Filters/GaussianBlur.cs b/ShareX.ImageEffectsLib/Filters/GaussianBlur.cs
similarity index 100%
rename from ImageEffectsLib/Filters/GaussianBlur.cs
rename to ShareX.ImageEffectsLib/Filters/GaussianBlur.cs
diff --git a/ImageEffectsLib/Filters/MatrixConvolution.cs b/ShareX.ImageEffectsLib/Filters/MatrixConvolution.cs
similarity index 100%
rename from ImageEffectsLib/Filters/MatrixConvolution.cs
rename to ShareX.ImageEffectsLib/Filters/MatrixConvolution.cs
diff --git a/ImageEffectsLib/Filters/MeanRemoval.cs b/ShareX.ImageEffectsLib/Filters/MeanRemoval.cs
similarity index 100%
rename from ImageEffectsLib/Filters/MeanRemoval.cs
rename to ShareX.ImageEffectsLib/Filters/MeanRemoval.cs
diff --git a/ImageEffectsLib/Filters/Outline.cs b/ShareX.ImageEffectsLib/Filters/Outline.cs
similarity index 100%
rename from ImageEffectsLib/Filters/Outline.cs
rename to ShareX.ImageEffectsLib/Filters/Outline.cs
diff --git a/ImageEffectsLib/Filters/Pixelate.cs b/ShareX.ImageEffectsLib/Filters/Pixelate.cs
similarity index 100%
rename from ImageEffectsLib/Filters/Pixelate.cs
rename to ShareX.ImageEffectsLib/Filters/Pixelate.cs
diff --git a/ImageEffectsLib/Filters/Reflection.cs b/ShareX.ImageEffectsLib/Filters/Reflection.cs
similarity index 100%
rename from ImageEffectsLib/Filters/Reflection.cs
rename to ShareX.ImageEffectsLib/Filters/Reflection.cs
diff --git a/ImageEffectsLib/Filters/Shadow.cs b/ShareX.ImageEffectsLib/Filters/Shadow.cs
similarity index 100%
rename from ImageEffectsLib/Filters/Shadow.cs
rename to ShareX.ImageEffectsLib/Filters/Shadow.cs
diff --git a/ImageEffectsLib/Filters/Sharpen.cs b/ShareX.ImageEffectsLib/Filters/Sharpen.cs
similarity index 100%
rename from ImageEffectsLib/Filters/Sharpen.cs
rename to ShareX.ImageEffectsLib/Filters/Sharpen.cs
diff --git a/ImageEffectsLib/Filters/Smooth.cs b/ShareX.ImageEffectsLib/Filters/Smooth.cs
similarity index 100%
rename from ImageEffectsLib/Filters/Smooth.cs
rename to ShareX.ImageEffectsLib/Filters/Smooth.cs
diff --git a/ImageEffectsLib/Filters/TornEdge.cs b/ShareX.ImageEffectsLib/Filters/TornEdge.cs
similarity index 100%
rename from ImageEffectsLib/Filters/TornEdge.cs
rename to ShareX.ImageEffectsLib/Filters/TornEdge.cs
diff --git a/ImageEffectsLib/ImageEffect.cs b/ShareX.ImageEffectsLib/ImageEffect.cs
similarity index 100%
rename from ImageEffectsLib/ImageEffect.cs
rename to ShareX.ImageEffectsLib/ImageEffect.cs
diff --git a/ImageEffectsLib/ImageEffectManager.cs b/ShareX.ImageEffectsLib/ImageEffectManager.cs
similarity index 100%
rename from ImageEffectsLib/ImageEffectManager.cs
rename to ShareX.ImageEffectsLib/ImageEffectManager.cs
diff --git a/ImageEffectsLib/ImageEffectsForm.Designer.cs b/ShareX.ImageEffectsLib/ImageEffectsForm.Designer.cs
similarity index 100%
rename from ImageEffectsLib/ImageEffectsForm.Designer.cs
rename to ShareX.ImageEffectsLib/ImageEffectsForm.Designer.cs
diff --git a/ImageEffectsLib/ImageEffectsForm.cs b/ShareX.ImageEffectsLib/ImageEffectsForm.cs
similarity index 100%
rename from ImageEffectsLib/ImageEffectsForm.cs
rename to ShareX.ImageEffectsLib/ImageEffectsForm.cs
diff --git a/ImageEffectsLib/ImageEffectsForm.resx b/ShareX.ImageEffectsLib/ImageEffectsForm.resx
similarity index 100%
rename from ImageEffectsLib/ImageEffectsForm.resx
rename to ShareX.ImageEffectsLib/ImageEffectsForm.resx
diff --git a/ImageEffectsLib/ImageEffectsForm.tr.resx b/ShareX.ImageEffectsLib/ImageEffectsForm.tr.resx
similarity index 100%
rename from ImageEffectsLib/ImageEffectsForm.tr.resx
rename to ShareX.ImageEffectsLib/ImageEffectsForm.tr.resx
diff --git a/ImageEffectsLib/ImageEffectsLib.csproj.DotSettings b/ShareX.ImageEffectsLib/ImageEffectsLib.csproj.DotSettings
similarity index 100%
rename from ImageEffectsLib/ImageEffectsLib.csproj.DotSettings
rename to ShareX.ImageEffectsLib/ImageEffectsLib.csproj.DotSettings
diff --git a/ImageEffectsLib/Manipulations/Canvas.cs b/ShareX.ImageEffectsLib/Manipulations/Canvas.cs
similarity index 100%
rename from ImageEffectsLib/Manipulations/Canvas.cs
rename to ShareX.ImageEffectsLib/Manipulations/Canvas.cs
diff --git a/ImageEffectsLib/Manipulations/Crop.cs b/ShareX.ImageEffectsLib/Manipulations/Crop.cs
similarity index 100%
rename from ImageEffectsLib/Manipulations/Crop.cs
rename to ShareX.ImageEffectsLib/Manipulations/Crop.cs
diff --git a/ImageEffectsLib/Manipulations/Flip.cs b/ShareX.ImageEffectsLib/Manipulations/Flip.cs
similarity index 100%
rename from ImageEffectsLib/Manipulations/Flip.cs
rename to ShareX.ImageEffectsLib/Manipulations/Flip.cs
diff --git a/ImageEffectsLib/Manipulations/Resize.cs b/ShareX.ImageEffectsLib/Manipulations/Resize.cs
similarity index 100%
rename from ImageEffectsLib/Manipulations/Resize.cs
rename to ShareX.ImageEffectsLib/Manipulations/Resize.cs
diff --git a/ImageEffectsLib/Manipulations/Rotate.cs b/ShareX.ImageEffectsLib/Manipulations/Rotate.cs
similarity index 100%
rename from ImageEffectsLib/Manipulations/Rotate.cs
rename to ShareX.ImageEffectsLib/Manipulations/Rotate.cs
diff --git a/ImageEffectsLib/Manipulations/RoundedCorners.cs b/ShareX.ImageEffectsLib/Manipulations/RoundedCorners.cs
similarity index 100%
rename from ImageEffectsLib/Manipulations/RoundedCorners.cs
rename to ShareX.ImageEffectsLib/Manipulations/RoundedCorners.cs
diff --git a/ImageEffectsLib/Manipulations/Scale.cs b/ShareX.ImageEffectsLib/Manipulations/Scale.cs
similarity index 100%
rename from ImageEffectsLib/Manipulations/Scale.cs
rename to ShareX.ImageEffectsLib/Manipulations/Scale.cs
diff --git a/ImageEffectsLib/Manipulations/Skew.cs b/ShareX.ImageEffectsLib/Manipulations/Skew.cs
similarity index 100%
rename from ImageEffectsLib/Manipulations/Skew.cs
rename to ShareX.ImageEffectsLib/Manipulations/Skew.cs
diff --git a/ImageEffectsLib/Properties/AssemblyInfo.cs b/ShareX.ImageEffectsLib/Properties/AssemblyInfo.cs
similarity index 84%
rename from ImageEffectsLib/Properties/AssemblyInfo.cs
rename to ShareX.ImageEffectsLib/Properties/AssemblyInfo.cs
index c78cdb218..b4b264e25 100644
--- a/ImageEffectsLib/Properties/AssemblyInfo.cs
+++ b/ShareX.ImageEffectsLib/Properties/AssemblyInfo.cs
@@ -1,11 +1,11 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("ImageEffectsLib")]
+[assembly: AssemblyTitle("ShareX ImageEffectsLib")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("ShareX Developers")]
-[assembly: AssemblyProduct("ImageEffectsLib")]
+[assembly: AssemblyProduct("ShareX")]
 [assembly: AssemblyCopyright("Copyright (C) 2007-2014 ShareX Developers")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/ImageEffectsLib/Properties/Resources.Designer.cs b/ShareX.ImageEffectsLib/Properties/Resources.Designer.cs
similarity index 100%
rename from ImageEffectsLib/Properties/Resources.Designer.cs
rename to ShareX.ImageEffectsLib/Properties/Resources.Designer.cs
diff --git a/ImageEffectsLib/Properties/Resources.resx b/ShareX.ImageEffectsLib/Properties/Resources.resx
similarity index 100%
rename from ImageEffectsLib/Properties/Resources.resx
rename to ShareX.ImageEffectsLib/Properties/Resources.resx
diff --git a/ImageEffectsLib/Properties/Resources.tr.resx b/ShareX.ImageEffectsLib/Properties/Resources.tr.resx
similarity index 100%
rename from ImageEffectsLib/Properties/Resources.tr.resx
rename to ShareX.ImageEffectsLib/Properties/Resources.tr.resx
diff --git a/ImageEffectsLib/ImageEffectsLib.csproj b/ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj
similarity index 97%
rename from ImageEffectsLib/ImageEffectsLib.csproj
rename to ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj
index 349d26ea3..bd6bd0088 100644
--- a/ImageEffectsLib/ImageEffectsLib.csproj
+++ b/ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ImageEffectsLib</RootNamespace>
-    <AssemblyName>ImageEffectsLib</AssemblyName>
+    <AssemblyName>ShareX.ImageEffectsLib</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
@@ -146,9 +146,9 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\HelpersLib\HelpersLib.csproj">
+    <ProjectReference Include="..\ShareX.HelpersLib\ShareX.HelpersLib.csproj">
       <Project>{327750e1-9fb7-4cc3-8aea-9bc42180cad3}</Project>
-      <Name>HelpersLib</Name>
+      <Name>ShareX.HelpersLib</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj.DotSettings b/ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj.DotSettings
new file mode 100644
index 000000000..a99420329
--- /dev/null
+++ b/ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeEditing/Localization/LocalizableInspector/@EntryValue">Pessimistic</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/ImageEffectsLib/WatermarkConfig.cs b/ShareX.ImageEffectsLib/WatermarkConfig.cs
similarity index 100%
rename from ImageEffectsLib/WatermarkConfig.cs
rename to ShareX.ImageEffectsLib/WatermarkConfig.cs
diff --git a/ImageEffectsLib/WatermarkForm.Designer.cs b/ShareX.ImageEffectsLib/WatermarkForm.Designer.cs
similarity index 100%
rename from ImageEffectsLib/WatermarkForm.Designer.cs
rename to ShareX.ImageEffectsLib/WatermarkForm.Designer.cs
diff --git a/ImageEffectsLib/WatermarkForm.cs b/ShareX.ImageEffectsLib/WatermarkForm.cs
similarity index 100%
rename from ImageEffectsLib/WatermarkForm.cs
rename to ShareX.ImageEffectsLib/WatermarkForm.cs
diff --git a/IndexerLib/Enums.cs b/ShareX.IndexerLib/Enums.cs
similarity index 100%
rename from IndexerLib/Enums.cs
rename to ShareX.IndexerLib/Enums.cs
diff --git a/IndexerLib/FolderInfo.cs b/ShareX.IndexerLib/FolderInfo.cs
similarity index 100%
rename from IndexerLib/FolderInfo.cs
rename to ShareX.IndexerLib/FolderInfo.cs
diff --git a/IndexerLib/HtmlHelper.cs b/ShareX.IndexerLib/HtmlHelper.cs
similarity index 100%
rename from IndexerLib/HtmlHelper.cs
rename to ShareX.IndexerLib/HtmlHelper.cs
diff --git a/IndexerLib/Indexer.cs b/ShareX.IndexerLib/Indexer.cs
similarity index 100%
rename from IndexerLib/Indexer.cs
rename to ShareX.IndexerLib/Indexer.cs
diff --git a/IndexerLib/IndexerDefault.css b/ShareX.IndexerLib/IndexerDefault.css
similarity index 100%
rename from IndexerLib/IndexerDefault.css
rename to ShareX.IndexerLib/IndexerDefault.css
diff --git a/IndexerLib/IndexerHtml.cs b/ShareX.IndexerLib/IndexerHtml.cs
similarity index 100%
rename from IndexerLib/IndexerHtml.cs
rename to ShareX.IndexerLib/IndexerHtml.cs
diff --git a/IndexerLib/IndexerLib.csproj.DotSettings b/ShareX.IndexerLib/IndexerLib.csproj.DotSettings
similarity index 100%
rename from IndexerLib/IndexerLib.csproj.DotSettings
rename to ShareX.IndexerLib/IndexerLib.csproj.DotSettings
diff --git a/IndexerLib/IndexerSettings.cs b/ShareX.IndexerLib/IndexerSettings.cs
similarity index 100%
rename from IndexerLib/IndexerSettings.cs
rename to ShareX.IndexerLib/IndexerSettings.cs
diff --git a/IndexerLib/IndexerText.cs b/ShareX.IndexerLib/IndexerText.cs
similarity index 100%
rename from IndexerLib/IndexerText.cs
rename to ShareX.IndexerLib/IndexerText.cs
diff --git a/IndexerLib/IndexerXml.cs b/ShareX.IndexerLib/IndexerXml.cs
similarity index 100%
rename from IndexerLib/IndexerXml.cs
rename to ShareX.IndexerLib/IndexerXml.cs
diff --git a/IndexerLib/Properties/AssemblyInfo.cs b/ShareX.IndexerLib/Properties/AssemblyInfo.cs
similarity index 85%
rename from IndexerLib/Properties/AssemblyInfo.cs
rename to ShareX.IndexerLib/Properties/AssemblyInfo.cs
index 409552975..1e5942953 100644
--- a/IndexerLib/Properties/AssemblyInfo.cs
+++ b/ShareX.IndexerLib/Properties/AssemblyInfo.cs
@@ -1,11 +1,11 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("IndexersLib")]
+[assembly: AssemblyTitle("ShareX IndexersLib")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("ShareX Developers")]
-[assembly: AssemblyProduct("IndexersLib")]
+[assembly: AssemblyProduct("ShareX")]
 [assembly: AssemblyCopyright("Copyright (C) 2007-2014 ShareX Developers")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/IndexerLib/Properties/Resources.Designer.cs b/ShareX.IndexerLib/Properties/Resources.Designer.cs
similarity index 100%
rename from IndexerLib/Properties/Resources.Designer.cs
rename to ShareX.IndexerLib/Properties/Resources.Designer.cs
diff --git a/IndexerLib/Properties/Resources.resx b/ShareX.IndexerLib/Properties/Resources.resx
similarity index 100%
rename from IndexerLib/Properties/Resources.resx
rename to ShareX.IndexerLib/Properties/Resources.resx
diff --git a/IndexerLib/Resources/doctype_xhtml.txt b/ShareX.IndexerLib/Resources/doctype_xhtml.txt
similarity index 100%
rename from IndexerLib/Resources/doctype_xhtml.txt
rename to ShareX.IndexerLib/Resources/doctype_xhtml.txt
diff --git a/IndexerLib/Resources/valid_xhtml.txt b/ShareX.IndexerLib/Resources/valid_xhtml.txt
similarity index 100%
rename from IndexerLib/Resources/valid_xhtml.txt
rename to ShareX.IndexerLib/Resources/valid_xhtml.txt
diff --git a/IndexerLib/IndexerLib.csproj b/ShareX.IndexerLib/ShareX.IndexerLib.csproj
similarity index 96%
rename from IndexerLib/IndexerLib.csproj
rename to ShareX.IndexerLib/ShareX.IndexerLib.csproj
index a720d4454..a78f941b2 100644
--- a/IndexerLib/IndexerLib.csproj
+++ b/ShareX.IndexerLib/ShareX.IndexerLib.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>IndexerLib</RootNamespace>
-    <AssemblyName>IndexerLib</AssemblyName>
+    <AssemblyName>ShareX.IndexerLib</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
@@ -62,9 +62,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\HelpersLib\HelpersLib.csproj">
+    <ProjectReference Include="..\ShareX.HelpersLib\ShareX.HelpersLib.csproj">
       <Project>{327750e1-9fb7-4cc3-8aea-9bc42180cad3}</Project>
-      <Name>HelpersLib</Name>
+      <Name>ShareX.HelpersLib</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/ShareX.IndexerLib/ShareX.IndexerLib.csproj.DotSettings b/ShareX.IndexerLib/ShareX.IndexerLib.csproj.DotSettings
new file mode 100644
index 000000000..a99420329
--- /dev/null
+++ b/ShareX.IndexerLib/ShareX.IndexerLib.csproj.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeEditing/Localization/LocalizableInspector/@EntryValue">Pessimistic</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/IndexerLib/packages.config b/ShareX.IndexerLib/packages.config
similarity index 100%
rename from IndexerLib/packages.config
rename to ShareX.IndexerLib/packages.config
diff --git a/ScreenCaptureLib/Enums.cs b/ShareX.ScreenCaptureLib/Enums.cs
similarity index 100%
rename from ScreenCaptureLib/Enums.cs
rename to ShareX.ScreenCaptureLib/Enums.cs
diff --git a/ScreenCaptureLib/Forms/DiamondRegion.cs b/ShareX.ScreenCaptureLib/Forms/DiamondRegion.cs
similarity index 100%
rename from ScreenCaptureLib/Forms/DiamondRegion.cs
rename to ShareX.ScreenCaptureLib/Forms/DiamondRegion.cs
diff --git a/ScreenCaptureLib/Forms/EllipseRegion.cs b/ShareX.ScreenCaptureLib/Forms/EllipseRegion.cs
similarity index 100%
rename from ScreenCaptureLib/Forms/EllipseRegion.cs
rename to ShareX.ScreenCaptureLib/Forms/EllipseRegion.cs
diff --git a/ScreenCaptureLib/Forms/FreeHandRegion.cs b/ShareX.ScreenCaptureLib/Forms/FreeHandRegion.cs
similarity index 100%
rename from ScreenCaptureLib/Forms/FreeHandRegion.cs
rename to ShareX.ScreenCaptureLib/Forms/FreeHandRegion.cs
diff --git a/ScreenCaptureLib/Forms/PolygonRegion.cs b/ShareX.ScreenCaptureLib/Forms/PolygonRegion.cs
similarity index 100%
rename from ScreenCaptureLib/Forms/PolygonRegion.cs
rename to ShareX.ScreenCaptureLib/Forms/PolygonRegion.cs
diff --git a/ScreenCaptureLib/Forms/RectangleAnnotate.cs b/ShareX.ScreenCaptureLib/Forms/RectangleAnnotate.cs
similarity index 100%
rename from ScreenCaptureLib/Forms/RectangleAnnotate.cs
rename to ShareX.ScreenCaptureLib/Forms/RectangleAnnotate.cs
diff --git a/ScreenCaptureLib/Forms/RectangleLight.cs b/ShareX.ScreenCaptureLib/Forms/RectangleLight.cs
similarity index 100%
rename from ScreenCaptureLib/Forms/RectangleLight.cs
rename to ShareX.ScreenCaptureLib/Forms/RectangleLight.cs
diff --git a/ScreenCaptureLib/Forms/RectangleRegion.cs b/ShareX.ScreenCaptureLib/Forms/RectangleRegion.cs
similarity index 100%
rename from ScreenCaptureLib/Forms/RectangleRegion.cs
rename to ShareX.ScreenCaptureLib/Forms/RectangleRegion.cs
diff --git a/ScreenCaptureLib/Forms/RoundedRectangleRegion.cs b/ShareX.ScreenCaptureLib/Forms/RoundedRectangleRegion.cs
similarity index 100%
rename from ScreenCaptureLib/Forms/RoundedRectangleRegion.cs
rename to ShareX.ScreenCaptureLib/Forms/RoundedRectangleRegion.cs
diff --git a/ScreenCaptureLib/Forms/Surface.cs b/ShareX.ScreenCaptureLib/Forms/Surface.cs
similarity index 100%
rename from ScreenCaptureLib/Forms/Surface.cs
rename to ShareX.ScreenCaptureLib/Forms/Surface.cs
diff --git a/ScreenCaptureLib/Forms/TriangleRegion.cs b/ShareX.ScreenCaptureLib/Forms/TriangleRegion.cs
similarity index 100%
rename from ScreenCaptureLib/Forms/TriangleRegion.cs
rename to ShareX.ScreenCaptureLib/Forms/TriangleRegion.cs
diff --git a/ScreenCaptureLib/LocationInfo.cs b/ShareX.ScreenCaptureLib/LocationInfo.cs
similarity index 100%
rename from ScreenCaptureLib/LocationInfo.cs
rename to ShareX.ScreenCaptureLib/LocationInfo.cs
diff --git a/ScreenCaptureLib/Properties/AssemblyInfo.cs b/ShareX.ScreenCaptureLib/Properties/AssemblyInfo.cs
similarity index 84%
rename from ScreenCaptureLib/Properties/AssemblyInfo.cs
rename to ShareX.ScreenCaptureLib/Properties/AssemblyInfo.cs
index 375037888..d4e079d93 100644
--- a/ScreenCaptureLib/Properties/AssemblyInfo.cs
+++ b/ShareX.ScreenCaptureLib/Properties/AssemblyInfo.cs
@@ -1,11 +1,11 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("ScreenCapture")]
+[assembly: AssemblyTitle("ShareX ScreenCapture")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("ShareX Developers")]
-[assembly: AssemblyProduct("ScreenCapture")]
+[assembly: AssemblyProduct("ShareX")]
 [assembly: AssemblyCopyright("Copyright (C) 2007-2014 ShareX Developers")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/ScreenCaptureLib/Properties/Resources.Designer.cs b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs
similarity index 100%
rename from ScreenCaptureLib/Properties/Resources.Designer.cs
rename to ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs
diff --git a/ScreenCaptureLib/Properties/Resources.resx b/ShareX.ScreenCaptureLib/Properties/Resources.resx
similarity index 100%
rename from ScreenCaptureLib/Properties/Resources.resx
rename to ShareX.ScreenCaptureLib/Properties/Resources.resx
diff --git a/ScreenCaptureLib/Properties/Resources.tr.resx b/ShareX.ScreenCaptureLib/Properties/Resources.tr.resx
similarity index 100%
rename from ScreenCaptureLib/Properties/Resources.tr.resx
rename to ShareX.ScreenCaptureLib/Properties/Resources.tr.resx
diff --git a/ScreenCaptureLib/RectangleAnnotateOptions.cs b/ShareX.ScreenCaptureLib/RectangleAnnotateOptions.cs
similarity index 100%
rename from ScreenCaptureLib/RectangleAnnotateOptions.cs
rename to ShareX.ScreenCaptureLib/RectangleAnnotateOptions.cs
diff --git a/ScreenCaptureLib/RegionHelpers/AreaManager.cs b/ShareX.ScreenCaptureLib/RegionHelpers/AreaManager.cs
similarity index 100%
rename from ScreenCaptureLib/RegionHelpers/AreaManager.cs
rename to ShareX.ScreenCaptureLib/RegionHelpers/AreaManager.cs
diff --git a/ScreenCaptureLib/RegionHelpers/DrawObject.cs b/ShareX.ScreenCaptureLib/RegionHelpers/DrawObject.cs
similarity index 100%
rename from ScreenCaptureLib/RegionHelpers/DrawObject.cs
rename to ShareX.ScreenCaptureLib/RegionHelpers/DrawObject.cs
diff --git a/ScreenCaptureLib/RegionHelpers/InputManager.cs b/ShareX.ScreenCaptureLib/RegionHelpers/InputManager.cs
similarity index 100%
rename from ScreenCaptureLib/RegionHelpers/InputManager.cs
rename to ShareX.ScreenCaptureLib/RegionHelpers/InputManager.cs
diff --git a/ScreenCaptureLib/RegionHelpers/MouseState.cs b/ShareX.ScreenCaptureLib/RegionHelpers/MouseState.cs
similarity index 100%
rename from ScreenCaptureLib/RegionHelpers/MouseState.cs
rename to ShareX.ScreenCaptureLib/RegionHelpers/MouseState.cs
diff --git a/ScreenCaptureLib/RegionHelpers/NodeObject.cs b/ShareX.ScreenCaptureLib/RegionHelpers/NodeObject.cs
similarity index 100%
rename from ScreenCaptureLib/RegionHelpers/NodeObject.cs
rename to ShareX.ScreenCaptureLib/RegionHelpers/NodeObject.cs
diff --git a/ScreenCaptureLib/RegionHelpers/ResizeManager.cs b/ShareX.ScreenCaptureLib/RegionHelpers/ResizeManager.cs
similarity index 100%
rename from ScreenCaptureLib/RegionHelpers/ResizeManager.cs
rename to ShareX.ScreenCaptureLib/RegionHelpers/ResizeManager.cs
diff --git a/ScreenCaptureLib/RegionHelpers/ShapeCaptureHelpers.cs b/ShareX.ScreenCaptureLib/RegionHelpers/ShapeCaptureHelpers.cs
similarity index 100%
rename from ScreenCaptureLib/RegionHelpers/ShapeCaptureHelpers.cs
rename to ShareX.ScreenCaptureLib/RegionHelpers/ShapeCaptureHelpers.cs
diff --git a/ScreenCaptureLib/Resources/Crosshair.cur b/ShareX.ScreenCaptureLib/Resources/Crosshair.cur
similarity index 100%
rename from ScreenCaptureLib/Resources/Crosshair.cur
rename to ShareX.ScreenCaptureLib/Resources/Crosshair.cur
diff --git a/ScreenCaptureLib/ScreenCaptureLib.csproj.DotSettings b/ShareX.ScreenCaptureLib/ScreenCaptureLib.csproj.DotSettings
similarity index 100%
rename from ScreenCaptureLib/ScreenCaptureLib.csproj.DotSettings
rename to ShareX.ScreenCaptureLib/ScreenCaptureLib.csproj.DotSettings
diff --git a/ScreenCaptureLib/Screencast/AVICache.cs b/ShareX.ScreenCaptureLib/Screencast/AVICache.cs
similarity index 100%
rename from ScreenCaptureLib/Screencast/AVICache.cs
rename to ShareX.ScreenCaptureLib/Screencast/AVICache.cs
diff --git a/ScreenCaptureLib/Screencast/AVIOptions.cs b/ShareX.ScreenCaptureLib/Screencast/AVIOptions.cs
similarity index 100%
rename from ScreenCaptureLib/Screencast/AVIOptions.cs
rename to ShareX.ScreenCaptureLib/Screencast/AVIOptions.cs
diff --git a/ScreenCaptureLib/Screencast/AviWriter.cs b/ShareX.ScreenCaptureLib/Screencast/AviWriter.cs
similarity index 100%
rename from ScreenCaptureLib/Screencast/AviWriter.cs
rename to ShareX.ScreenCaptureLib/Screencast/AviWriter.cs
diff --git a/ScreenCaptureLib/Screencast/FFmpegHelper.cs b/ShareX.ScreenCaptureLib/Screencast/FFmpegHelper.cs
similarity index 100%
rename from ScreenCaptureLib/Screencast/FFmpegHelper.cs
rename to ShareX.ScreenCaptureLib/Screencast/FFmpegHelper.cs
diff --git a/ScreenCaptureLib/Screencast/FFmpegOptions.cs b/ShareX.ScreenCaptureLib/Screencast/FFmpegOptions.cs
similarity index 100%
rename from ScreenCaptureLib/Screencast/FFmpegOptions.cs
rename to ShareX.ScreenCaptureLib/Screencast/FFmpegOptions.cs
diff --git a/ScreenCaptureLib/Screencast/FFmpegOptionsForm.Designer.cs b/ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.Designer.cs
similarity index 100%
rename from ScreenCaptureLib/Screencast/FFmpegOptionsForm.Designer.cs
rename to ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.Designer.cs
diff --git a/ScreenCaptureLib/Screencast/FFmpegOptionsForm.cs b/ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.cs
similarity index 100%
rename from ScreenCaptureLib/Screencast/FFmpegOptionsForm.cs
rename to ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.cs
diff --git a/ScreenCaptureLib/Screencast/FFmpegOptionsForm.resx b/ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.resx
similarity index 100%
rename from ScreenCaptureLib/Screencast/FFmpegOptionsForm.resx
rename to ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.resx
diff --git a/ScreenCaptureLib/Screencast/FFmpegOptionsForm.tr.resx b/ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.tr.resx
similarity index 100%
rename from ScreenCaptureLib/Screencast/FFmpegOptionsForm.tr.resx
rename to ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.tr.resx
diff --git a/ScreenCaptureLib/Screencast/HardDiskCache.cs b/ShareX.ScreenCaptureLib/Screencast/HardDiskCache.cs
similarity index 100%
rename from ScreenCaptureLib/Screencast/HardDiskCache.cs
rename to ShareX.ScreenCaptureLib/Screencast/HardDiskCache.cs
diff --git a/ScreenCaptureLib/Screencast/ImageCache.cs b/ShareX.ScreenCaptureLib/Screencast/ImageCache.cs
similarity index 100%
rename from ScreenCaptureLib/Screencast/ImageCache.cs
rename to ShareX.ScreenCaptureLib/Screencast/ImageCache.cs
diff --git a/ScreenCaptureLib/Screencast/ScreenRecorder.cs b/ShareX.ScreenCaptureLib/Screencast/ScreenRecorder.cs
similarity index 100%
rename from ScreenCaptureLib/Screencast/ScreenRecorder.cs
rename to ShareX.ScreenCaptureLib/Screencast/ScreenRecorder.cs
diff --git a/ScreenCaptureLib/Screencast/ScreencastOptions.cs b/ShareX.ScreenCaptureLib/Screencast/ScreencastOptions.cs
similarity index 100%
rename from ScreenCaptureLib/Screencast/ScreencastOptions.cs
rename to ShareX.ScreenCaptureLib/Screencast/ScreencastOptions.cs
diff --git a/ScreenCaptureLib/Screenshot.cs b/ShareX.ScreenCaptureLib/Screenshot.cs
similarity index 100%
rename from ScreenCaptureLib/Screenshot.cs
rename to ShareX.ScreenCaptureLib/Screenshot.cs
diff --git a/ScreenCaptureLib/Screenshot_Transparent.cs b/ShareX.ScreenCaptureLib/Screenshot_Transparent.cs
similarity index 100%
rename from ScreenCaptureLib/Screenshot_Transparent.cs
rename to ShareX.ScreenCaptureLib/Screenshot_Transparent.cs
diff --git a/ScreenCaptureLib/ScreenCaptureLib.csproj b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
similarity index 97%
rename from ScreenCaptureLib/ScreenCaptureLib.csproj
rename to ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
index 8e6196587..f58b8a64e 100644
--- a/ScreenCaptureLib/ScreenCaptureLib.csproj
+++ b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ScreenCaptureLib</RootNamespace>
-    <AssemblyName>ScreenCaptureLib</AssemblyName>
+    <AssemblyName>ShareX.ScreenCaptureLib</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
@@ -115,9 +115,9 @@
     <Compile Include="WindowsRectangleList.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\HelpersLib\HelpersLib.csproj">
+    <ProjectReference Include="..\ShareX.HelpersLib\ShareX.HelpersLib.csproj">
       <Project>{327750E1-9FB7-4CC3-8AEA-9BC42180CAD3}</Project>
-      <Name>HelpersLib</Name>
+      <Name>ShareX.HelpersLib</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj.DotSettings b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj.DotSettings
new file mode 100644
index 000000000..a99420329
--- /dev/null
+++ b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeEditing/Localization/LocalizableInspector/@EntryValue">Pessimistic</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/ScreenCaptureLib/SurfaceOptions.cs b/ShareX.ScreenCaptureLib/SurfaceOptions.cs
similarity index 100%
rename from ScreenCaptureLib/SurfaceOptions.cs
rename to ShareX.ScreenCaptureLib/SurfaceOptions.cs
diff --git a/ScreenCaptureLib/WindowInfo.cs b/ShareX.ScreenCaptureLib/WindowInfo.cs
similarity index 100%
rename from ScreenCaptureLib/WindowInfo.cs
rename to ShareX.ScreenCaptureLib/WindowInfo.cs
diff --git a/ScreenCaptureLib/WindowsList.cs b/ShareX.ScreenCaptureLib/WindowsList.cs
similarity index 100%
rename from ScreenCaptureLib/WindowsList.cs
rename to ShareX.ScreenCaptureLib/WindowsList.cs
diff --git a/ScreenCaptureLib/WindowsRectangleList.cs b/ShareX.ScreenCaptureLib/WindowsRectangleList.cs
similarity index 100%
rename from ScreenCaptureLib/WindowsRectangleList.cs
rename to ShareX.ScreenCaptureLib/WindowsRectangleList.cs
diff --git a/ShareX_Setup/Program.cs b/ShareX.Setup/Program.cs
similarity index 99%
rename from ShareX_Setup/Program.cs
rename to ShareX.Setup/Program.cs
index 25c83fe83..9f7102770 100644
--- a/ShareX_Setup/Program.cs
+++ b/ShareX.Setup/Program.cs
@@ -41,7 +41,7 @@ private enum SetupType
             Beta // Build setup + upload it using "Debug/ShareX.exe"
         }
 
-        private const SetupType Setup = SetupType.Stable;
+        private const SetupType Setup = SetupType.Beta;
 
         private static string parentDir = @"..\..\..\";
         private static string binDir = Path.Combine(parentDir, @"ShareX\bin");
diff --git a/ShareX_Setup/Properties/AssemblyInfo.cs b/ShareX.Setup/Properties/AssemblyInfo.cs
similarity index 96%
rename from ShareX_Setup/Properties/AssemblyInfo.cs
rename to ShareX.Setup/Properties/AssemblyInfo.cs
index 186938009..7ea5db0a9 100644
--- a/ShareX_Setup/Properties/AssemblyInfo.cs
+++ b/ShareX.Setup/Properties/AssemblyInfo.cs
@@ -4,7 +4,7 @@
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("ShareX")]
+[assembly: AssemblyTitle("ShareX Setup")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("ShareX Developers")]
diff --git a/ShareX_Setup/ShareX_Setup.csproj b/ShareX.Setup/ShareX.Setup.csproj
similarity index 98%
rename from ShareX_Setup/ShareX_Setup.csproj
rename to ShareX.Setup/ShareX.Setup.csproj
index 95418ae48..b0a112086 100644
--- a/ShareX_Setup/ShareX_Setup.csproj
+++ b/ShareX.Setup/ShareX.Setup.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ShareX</RootNamespace>
-    <AssemblyName>ShareX</AssemblyName>
+    <AssemblyName>ShareX.Setup</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
diff --git a/ShareX_Setup/app.config b/ShareX.Setup/app.config
similarity index 100%
rename from ShareX_Setup/app.config
rename to ShareX.Setup/app.config
diff --git a/UploadersLib/APIKeys/APIKeys.cs b/ShareX.UploadersLib/APIKeys/APIKeys.cs
similarity index 100%
rename from UploadersLib/APIKeys/APIKeys.cs
rename to ShareX.UploadersLib/APIKeys/APIKeys.cs
diff --git a/ShareX.UploadersLib/APIKeys/APIKeysLocal.cs b/ShareX.UploadersLib/APIKeys/APIKeysLocal.cs
new file mode 100644
index 000000000..425156c84
--- /dev/null
+++ b/ShareX.UploadersLib/APIKeys/APIKeysLocal.cs
@@ -0,0 +1,80 @@
+#region License Information (GPL v3)
+
+/*
+    ShareX - A program that allows you to take screenshots and share any file type
+    Copyright (C) 2007-2014 ShareX Developers
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+    Optionally you can also view the license at <http://www.gnu.org/licenses/>.
+*/
+
+#endregion License Information (GPL v3)
+
+namespace UploadersLib
+{
+    public static partial class APIKeys
+    {
+        static APIKeys()
+        {
+            // Image Uploaders
+            ImageShackKey = "5DEFHIMQ81951c9e786e00f21774fec39382b6ad";
+            TinyPicID = "e2aabb8d555322fa";
+            TinyPicKey = "00a68ed73ddd54da52dc2d5803fa35ee";
+            ImgurClientID = "d297fd441566f99";
+            ImgurClientSecret = "0cfdf9368cbf988e69dff262d0425debd440fcc2"; // 2014-05-01
+            FlickrKey = "fbe042faa01e6af0371b6d87be75436a";
+            FlickrSecret = "9f85687dcccc7ef9";
+            PhotobucketConsumerKey = "149828681";
+            PhotobucketConsumerSecret = "d2638b653e88315aac528087e9db54e3";
+            TwitsnapsKey = "694aaea3bc8f28479c383cbcc094fb55";
+            TwitPicKey = "816528c0152003a64e45402370805a5a";
+
+            // File Uploaders
+            DropboxConsumerKey = "0te7j9ype9lrdfn";
+            DropboxConsumerSecret = "r5d3aptd9a0cwp9";
+            MinusConsumerKey = "b57b69843f7a302a276dde89890fc6";
+            MinusConsumerSecret = "3fb097f08314d713959b1f41d543b0";
+            BoxClientID = "5vd8549xmn9a7zil4iupb0ciroj7cvee";
+            BoxClientSecret = "ghibKYH2nFSkfl6in4Rr2H9qGsiZHViY"; // 2014-05-01
+            SendSpaceKey = "LV6OS1R0Q3";
+            Ge_ttKey = "tdrrlb84kq2dquxrh4dw79gr3act0529";
+            JiraConsumerKey = "NJgrJ4EhAahDwYuxLTtT"; // Random generated string
+            CopyConsumerKey = "OgfXHS0yKaMGHo43Nhp0Ft3EJbvJ1JAn"; // 2014-06-05
+            CopyConsumerSecret = "rbN1inAsx5M2slBHESJFhiapTdgZlQ02szCSBoQ0spvjDW3C"; // 2014-06-05
+            MediaFireAppId = "41957"; // 2014-07-23
+            MediaFireApiKey = "t12h2z1i7aui9boh7ttlx3j8549ufb3hje16k6ty"; // 2014-07-23
+            OneDriveClientID = "0000000044121D26"; // 2014-08-09
+            OneDriveClientSecret = "OguPAGq1b5HzIDheuYR4ncdjvCqdXdSh"; // 2014-08-09
+
+            // Text Uploaders
+            PastebinKey = "4b23be71ec78bbd4fb96735320aa09ef";
+            PastebinCaKey = "KxTofLKQThSBZ63Gpa7hYLlMdyQlMD6u";
+            GitHubID = "badfa7b5e0a67e31da88";
+            GitHubSecret = "798dacd8f607cbc0777f6b90bd7c447da17263e8"; // 2014-05-01
+
+            // URL Shorteners
+            BitlyClientID = "0bf9726bea922ab7d5760a913d6749b441e5176a";
+            BitlyClientSecret = "fac46280c197865786a0af203f77d10abc3f533e"; // 2014-07-15
+
+            // Other Services
+            GoogleAPIKey = "AIzaSyCAawIgkVq9ftQUY06rSdtN4LDbBdGJ3FE"; // 2014-05-01
+            GoogleClientID = "810697162603-ag350u1fnmf3riubv91otme0v5fkk2d6.apps.googleusercontent.com"; // 2014-05-01
+            GoogleClientSecret = "mDft-efE0PUcwIRCLG8nkLD9"; // 2014-05-01
+            TwitterConsumerKey = "lZWoBpWcpJUKYbGGO7bl4S1ys"; // 2014-05-01
+            TwitterConsumerSecret = "HyqkOlGkS4sORHRtBIUsL6Kit70OvJ3lgr784pomDQ6tijT0hg"; // 2014-05-01
+        }
+    }
+}
\ No newline at end of file
diff --git a/UploadersLib/Controls/AccountTypeControl.Designer.cs b/ShareX.UploadersLib/Controls/AccountTypeControl.Designer.cs
similarity index 100%
rename from UploadersLib/Controls/AccountTypeControl.Designer.cs
rename to ShareX.UploadersLib/Controls/AccountTypeControl.Designer.cs
diff --git a/UploadersLib/Controls/AccountTypeControl.cs b/ShareX.UploadersLib/Controls/AccountTypeControl.cs
similarity index 100%
rename from UploadersLib/Controls/AccountTypeControl.cs
rename to ShareX.UploadersLib/Controls/AccountTypeControl.cs
diff --git a/UploadersLib/Controls/AccountTypeControl.resx b/ShareX.UploadersLib/Controls/AccountTypeControl.resx
similarity index 100%
rename from UploadersLib/Controls/AccountTypeControl.resx
rename to ShareX.UploadersLib/Controls/AccountTypeControl.resx
diff --git a/UploadersLib/Controls/AccountTypeControl.tr.resx b/ShareX.UploadersLib/Controls/AccountTypeControl.tr.resx
similarity index 100%
rename from UploadersLib/Controls/AccountTypeControl.tr.resx
rename to ShareX.UploadersLib/Controls/AccountTypeControl.tr.resx
diff --git a/UploadersLib/Controls/AccountsControl.Designer.cs b/ShareX.UploadersLib/Controls/AccountsControl.Designer.cs
similarity index 100%
rename from UploadersLib/Controls/AccountsControl.Designer.cs
rename to ShareX.UploadersLib/Controls/AccountsControl.Designer.cs
diff --git a/UploadersLib/Controls/AccountsControl.cs b/ShareX.UploadersLib/Controls/AccountsControl.cs
similarity index 100%
rename from UploadersLib/Controls/AccountsControl.cs
rename to ShareX.UploadersLib/Controls/AccountsControl.cs
diff --git a/UploadersLib/Controls/AccountsControl.resx b/ShareX.UploadersLib/Controls/AccountsControl.resx
similarity index 100%
rename from UploadersLib/Controls/AccountsControl.resx
rename to ShareX.UploadersLib/Controls/AccountsControl.resx
diff --git a/UploadersLib/Controls/AccountsControl.tr.resx b/ShareX.UploadersLib/Controls/AccountsControl.tr.resx
similarity index 100%
rename from UploadersLib/Controls/AccountsControl.tr.resx
rename to ShareX.UploadersLib/Controls/AccountsControl.tr.resx
diff --git a/UploadersLib/Controls/OAuthControl.Designer.cs b/ShareX.UploadersLib/Controls/OAuthControl.Designer.cs
similarity index 100%
rename from UploadersLib/Controls/OAuthControl.Designer.cs
rename to ShareX.UploadersLib/Controls/OAuthControl.Designer.cs
diff --git a/UploadersLib/Controls/OAuthControl.cs b/ShareX.UploadersLib/Controls/OAuthControl.cs
similarity index 100%
rename from UploadersLib/Controls/OAuthControl.cs
rename to ShareX.UploadersLib/Controls/OAuthControl.cs
diff --git a/UploadersLib/Controls/OAuthControl.resx b/ShareX.UploadersLib/Controls/OAuthControl.resx
similarity index 100%
rename from UploadersLib/Controls/OAuthControl.resx
rename to ShareX.UploadersLib/Controls/OAuthControl.resx
diff --git a/UploadersLib/Controls/OAuthControl.tr.resx b/ShareX.UploadersLib/Controls/OAuthControl.tr.resx
similarity index 100%
rename from UploadersLib/Controls/OAuthControl.tr.resx
rename to ShareX.UploadersLib/Controls/OAuthControl.tr.resx
diff --git a/UploadersLib/Enums.cs b/ShareX.UploadersLib/Enums.cs
similarity index 100%
rename from UploadersLib/Enums.cs
rename to ShareX.UploadersLib/Enums.cs
diff --git a/UploadersLib/FTPClient/FTPClientForm.Designer.cs b/ShareX.UploadersLib/FTPClient/FTPClientForm.Designer.cs
similarity index 100%
rename from UploadersLib/FTPClient/FTPClientForm.Designer.cs
rename to ShareX.UploadersLib/FTPClient/FTPClientForm.Designer.cs
diff --git a/UploadersLib/FTPClient/FTPClientForm.cs b/ShareX.UploadersLib/FTPClient/FTPClientForm.cs
similarity index 100%
rename from UploadersLib/FTPClient/FTPClientForm.cs
rename to ShareX.UploadersLib/FTPClient/FTPClientForm.cs
diff --git a/UploadersLib/FTPClient/FTPClientForm.resx b/ShareX.UploadersLib/FTPClient/FTPClientForm.resx
similarity index 100%
rename from UploadersLib/FTPClient/FTPClientForm.resx
rename to ShareX.UploadersLib/FTPClient/FTPClientForm.resx
diff --git a/UploadersLib/FTPClient/FTPClientForm.tr.resx b/ShareX.UploadersLib/FTPClient/FTPClientForm.tr.resx
similarity index 100%
rename from UploadersLib/FTPClient/FTPClientForm.tr.resx
rename to ShareX.UploadersLib/FTPClient/FTPClientForm.tr.resx
diff --git a/UploadersLib/FTPClient/IconHelper.cs b/ShareX.UploadersLib/FTPClient/IconHelper.cs
similarity index 100%
rename from UploadersLib/FTPClient/IconHelper.cs
rename to ShareX.UploadersLib/FTPClient/IconHelper.cs
diff --git a/UploadersLib/FTPClient/IconListManager.cs b/ShareX.UploadersLib/FTPClient/IconListManager.cs
similarity index 100%
rename from UploadersLib/FTPClient/IconListManager.cs
rename to ShareX.UploadersLib/FTPClient/IconListManager.cs
diff --git a/UploadersLib/FTPClient/ListViewEx.cs b/ShareX.UploadersLib/FTPClient/ListViewEx.cs
similarity index 100%
rename from UploadersLib/FTPClient/ListViewEx.cs
rename to ShareX.UploadersLib/FTPClient/ListViewEx.cs
diff --git a/UploadersLib/Favicons/AdFly.ico b/ShareX.UploadersLib/Favicons/AdFly.ico
similarity index 100%
rename from UploadersLib/Favicons/AdFly.ico
rename to ShareX.UploadersLib/Favicons/AdFly.ico
diff --git a/UploadersLib/Favicons/AmazonS3.ico b/ShareX.UploadersLib/Favicons/AmazonS3.ico
similarity index 100%
rename from UploadersLib/Favicons/AmazonS3.ico
rename to ShareX.UploadersLib/Favicons/AmazonS3.ico
diff --git a/UploadersLib/Favicons/Bitly.ico b/ShareX.UploadersLib/Favicons/Bitly.ico
similarity index 100%
rename from UploadersLib/Favicons/Bitly.ico
rename to ShareX.UploadersLib/Favicons/Bitly.ico
diff --git a/UploadersLib/Favicons/Box.ico b/ShareX.UploadersLib/Favicons/Box.ico
similarity index 100%
rename from UploadersLib/Favicons/Box.ico
rename to ShareX.UploadersLib/Favicons/Box.ico
diff --git a/UploadersLib/Favicons/Chevereto.png b/ShareX.UploadersLib/Favicons/Chevereto.png
similarity index 100%
rename from UploadersLib/Favicons/Chevereto.png
rename to ShareX.UploadersLib/Favicons/Chevereto.png
diff --git a/UploadersLib/Favicons/Dropbox.ico b/ShareX.UploadersLib/Favicons/Dropbox.ico
similarity index 100%
rename from UploadersLib/Favicons/Dropbox.ico
rename to ShareX.UploadersLib/Favicons/Dropbox.ico
diff --git a/UploadersLib/Favicons/Flickr.ico b/ShareX.UploadersLib/Favicons/Flickr.ico
similarity index 100%
rename from UploadersLib/Favicons/Flickr.ico
rename to ShareX.UploadersLib/Favicons/Flickr.ico
diff --git a/UploadersLib/Favicons/Gett.ico b/ShareX.UploadersLib/Favicons/Gett.ico
similarity index 100%
rename from UploadersLib/Favicons/Gett.ico
rename to ShareX.UploadersLib/Favicons/Gett.ico
diff --git a/UploadersLib/Favicons/GitHub.ico b/ShareX.UploadersLib/Favicons/GitHub.ico
similarity index 100%
rename from UploadersLib/Favicons/GitHub.ico
rename to ShareX.UploadersLib/Favicons/GitHub.ico
diff --git a/UploadersLib/Favicons/Google.ico b/ShareX.UploadersLib/Favicons/Google.ico
similarity index 100%
rename from UploadersLib/Favicons/Google.ico
rename to ShareX.UploadersLib/Favicons/Google.ico
diff --git a/UploadersLib/Favicons/GoogleDrive.ico b/ShareX.UploadersLib/Favicons/GoogleDrive.ico
similarity index 100%
rename from UploadersLib/Favicons/GoogleDrive.ico
rename to ShareX.UploadersLib/Favicons/GoogleDrive.ico
diff --git a/UploadersLib/Favicons/Hastebin.png b/ShareX.UploadersLib/Favicons/Hastebin.png
similarity index 100%
rename from UploadersLib/Favicons/Hastebin.png
rename to ShareX.UploadersLib/Favicons/Hastebin.png
diff --git a/UploadersLib/Favicons/Hostr.ico b/ShareX.UploadersLib/Favicons/Hostr.ico
similarity index 100%
rename from UploadersLib/Favicons/Hostr.ico
rename to ShareX.UploadersLib/Favicons/Hostr.ico
diff --git a/UploadersLib/Favicons/ImageShack.ico b/ShareX.UploadersLib/Favicons/ImageShack.ico
similarity index 100%
rename from UploadersLib/Favicons/ImageShack.ico
rename to ShareX.UploadersLib/Favicons/ImageShack.ico
diff --git a/UploadersLib/Favicons/Imgur.ico b/ShareX.UploadersLib/Favicons/Imgur.ico
similarity index 100%
rename from UploadersLib/Favicons/Imgur.ico
rename to ShareX.UploadersLib/Favicons/Imgur.ico
diff --git a/UploadersLib/Favicons/MediaCrush.ico b/ShareX.UploadersLib/Favicons/MediaCrush.ico
similarity index 100%
rename from UploadersLib/Favicons/MediaCrush.ico
rename to ShareX.UploadersLib/Favicons/MediaCrush.ico
diff --git a/UploadersLib/Favicons/MediaFire.ico b/ShareX.UploadersLib/Favicons/MediaFire.ico
similarity index 100%
rename from UploadersLib/Favicons/MediaFire.ico
rename to ShareX.UploadersLib/Favicons/MediaFire.ico
diff --git a/UploadersLib/Favicons/Mega.ico b/ShareX.UploadersLib/Favicons/Mega.ico
similarity index 100%
rename from UploadersLib/Favicons/Mega.ico
rename to ShareX.UploadersLib/Favicons/Mega.ico
diff --git a/UploadersLib/Favicons/Minus.ico b/ShareX.UploadersLib/Favicons/Minus.ico
similarity index 100%
rename from UploadersLib/Favicons/Minus.ico
rename to ShareX.UploadersLib/Favicons/Minus.ico
diff --git a/UploadersLib/Favicons/OneDrive.ico b/ShareX.UploadersLib/Favicons/OneDrive.ico
similarity index 100%
rename from UploadersLib/Favicons/OneDrive.ico
rename to ShareX.UploadersLib/Favicons/OneDrive.ico
diff --git a/UploadersLib/Favicons/OwnCloud.png b/ShareX.UploadersLib/Favicons/OwnCloud.png
similarity index 100%
rename from UploadersLib/Favicons/OwnCloud.png
rename to ShareX.UploadersLib/Favicons/OwnCloud.png
diff --git a/UploadersLib/Favicons/Pastebin.ico b/ShareX.UploadersLib/Favicons/Pastebin.ico
similarity index 100%
rename from UploadersLib/Favicons/Pastebin.ico
rename to ShareX.UploadersLib/Favicons/Pastebin.ico
diff --git a/UploadersLib/Favicons/Photobucket.ico b/ShareX.UploadersLib/Favicons/Photobucket.ico
similarity index 100%
rename from UploadersLib/Favicons/Photobucket.ico
rename to ShareX.UploadersLib/Favicons/Photobucket.ico
diff --git a/UploadersLib/Favicons/Picasa.ico b/ShareX.UploadersLib/Favicons/Picasa.ico
similarity index 100%
rename from UploadersLib/Favicons/Picasa.ico
rename to ShareX.UploadersLib/Favicons/Picasa.ico
diff --git a/UploadersLib/Favicons/Pushbullet.ico b/ShareX.UploadersLib/Favicons/Pushbullet.ico
similarity index 100%
rename from UploadersLib/Favicons/Pushbullet.ico
rename to ShareX.UploadersLib/Favicons/Pushbullet.ico
diff --git a/UploadersLib/Favicons/RapidShare.ico b/ShareX.UploadersLib/Favicons/RapidShare.ico
similarity index 100%
rename from UploadersLib/Favicons/RapidShare.ico
rename to ShareX.UploadersLib/Favicons/RapidShare.ico
diff --git a/UploadersLib/Favicons/SendSpace.ico b/ShareX.UploadersLib/Favicons/SendSpace.ico
similarity index 100%
rename from UploadersLib/Favicons/SendSpace.ico
rename to ShareX.UploadersLib/Favicons/SendSpace.ico
diff --git a/UploadersLib/Favicons/TinyPic.ico b/ShareX.UploadersLib/Favicons/TinyPic.ico
similarity index 100%
rename from UploadersLib/Favicons/TinyPic.ico
rename to ShareX.UploadersLib/Favicons/TinyPic.ico
diff --git a/UploadersLib/Favicons/Twitter.ico b/ShareX.UploadersLib/Favicons/Twitter.ico
similarity index 100%
rename from UploadersLib/Favicons/Twitter.ico
rename to ShareX.UploadersLib/Favicons/Twitter.ico
diff --git a/UploadersLib/Favicons/Upaste.ico b/ShareX.UploadersLib/Favicons/Upaste.ico
similarity index 100%
rename from UploadersLib/Favicons/Upaste.ico
rename to ShareX.UploadersLib/Favicons/Upaste.ico
diff --git a/UploadersLib/Favicons/Yourls.ico b/ShareX.UploadersLib/Favicons/Yourls.ico
similarity index 100%
rename from UploadersLib/Favicons/Yourls.ico
rename to ShareX.UploadersLib/Favicons/Yourls.ico
diff --git a/UploadersLib/Favicons/copy.ico b/ShareX.UploadersLib/Favicons/copy.ico
similarity index 100%
rename from UploadersLib/Favicons/copy.ico
rename to ShareX.UploadersLib/Favicons/copy.ico
diff --git a/UploadersLib/Favicons/jira.png b/ShareX.UploadersLib/Favicons/jira.png
similarity index 100%
rename from UploadersLib/Favicons/jira.png
rename to ShareX.UploadersLib/Favicons/jira.png
diff --git a/UploadersLib/FileUploader.cs b/ShareX.UploadersLib/FileUploader.cs
similarity index 100%
rename from UploadersLib/FileUploader.cs
rename to ShareX.UploadersLib/FileUploader.cs
diff --git a/UploadersLib/FileUploaders/AmazonS3.cs b/ShareX.UploadersLib/FileUploaders/AmazonS3.cs
similarity index 100%
rename from UploadersLib/FileUploaders/AmazonS3.cs
rename to ShareX.UploadersLib/FileUploaders/AmazonS3.cs
diff --git a/UploadersLib/FileUploaders/Box.cs b/ShareX.UploadersLib/FileUploaders/Box.cs
similarity index 100%
rename from UploadersLib/FileUploaders/Box.cs
rename to ShareX.UploadersLib/FileUploaders/Box.cs
diff --git a/UploadersLib/FileUploaders/Copy.cs b/ShareX.UploadersLib/FileUploaders/Copy.cs
similarity index 100%
rename from UploadersLib/FileUploaders/Copy.cs
rename to ShareX.UploadersLib/FileUploaders/Copy.cs
diff --git a/UploadersLib/FileUploaders/CustomFileUploader.cs b/ShareX.UploadersLib/FileUploaders/CustomFileUploader.cs
similarity index 100%
rename from UploadersLib/FileUploaders/CustomFileUploader.cs
rename to ShareX.UploadersLib/FileUploaders/CustomFileUploader.cs
diff --git a/UploadersLib/FileUploaders/DropIO.cs b/ShareX.UploadersLib/FileUploaders/DropIO.cs
similarity index 100%
rename from UploadersLib/FileUploaders/DropIO.cs
rename to ShareX.UploadersLib/FileUploaders/DropIO.cs
diff --git a/UploadersLib/FileUploaders/Dropbox.cs b/ShareX.UploadersLib/FileUploaders/Dropbox.cs
similarity index 100%
rename from UploadersLib/FileUploaders/Dropbox.cs
rename to ShareX.UploadersLib/FileUploaders/Dropbox.cs
diff --git a/UploadersLib/FileUploaders/Email.cs b/ShareX.UploadersLib/FileUploaders/Email.cs
similarity index 100%
rename from UploadersLib/FileUploaders/Email.cs
rename to ShareX.UploadersLib/FileUploaders/Email.cs
diff --git a/UploadersLib/FileUploaders/FTP.cs b/ShareX.UploadersLib/FileUploaders/FTP.cs
similarity index 100%
rename from UploadersLib/FileUploaders/FTP.cs
rename to ShareX.UploadersLib/FileUploaders/FTP.cs
diff --git a/UploadersLib/FileUploaders/FTP/FTPAccount.cs b/ShareX.UploadersLib/FileUploaders/FTP/FTPAccount.cs
similarity index 100%
rename from UploadersLib/FileUploaders/FTP/FTPAccount.cs
rename to ShareX.UploadersLib/FileUploaders/FTP/FTPAccount.cs
diff --git a/UploadersLib/FileUploaders/FTP/FTPAdapter.cs b/ShareX.UploadersLib/FileUploaders/FTP/FTPAdapter.cs
similarity index 100%
rename from UploadersLib/FileUploaders/FTP/FTPAdapter.cs
rename to ShareX.UploadersLib/FileUploaders/FTP/FTPAdapter.cs
diff --git a/UploadersLib/FileUploaders/FileBin.cs b/ShareX.UploadersLib/FileUploaders/FileBin.cs
similarity index 100%
rename from UploadersLib/FileUploaders/FileBin.cs
rename to ShareX.UploadersLib/FileUploaders/FileBin.cs
diff --git a/UploadersLib/FileUploaders/FileSonic.cs b/ShareX.UploadersLib/FileUploaders/FileSonic.cs
similarity index 100%
rename from UploadersLib/FileUploaders/FileSonic.cs
rename to ShareX.UploadersLib/FileUploaders/FileSonic.cs
diff --git a/UploadersLib/FileUploaders/Ge_tt.cs b/ShareX.UploadersLib/FileUploaders/Ge_tt.cs
similarity index 100%
rename from UploadersLib/FileUploaders/Ge_tt.cs
rename to ShareX.UploadersLib/FileUploaders/Ge_tt.cs
diff --git a/UploadersLib/FileUploaders/GfycatUploader.cs b/ShareX.UploadersLib/FileUploaders/GfycatUploader.cs
similarity index 100%
rename from UploadersLib/FileUploaders/GfycatUploader.cs
rename to ShareX.UploadersLib/FileUploaders/GfycatUploader.cs
diff --git a/UploadersLib/FileUploaders/GoogleDrive.cs b/ShareX.UploadersLib/FileUploaders/GoogleDrive.cs
similarity index 100%
rename from UploadersLib/FileUploaders/GoogleDrive.cs
rename to ShareX.UploadersLib/FileUploaders/GoogleDrive.cs
diff --git a/UploadersLib/FileUploaders/Hostr.cs b/ShareX.UploadersLib/FileUploaders/Hostr.cs
similarity index 100%
rename from UploadersLib/FileUploaders/Hostr.cs
rename to ShareX.UploadersLib/FileUploaders/Hostr.cs
diff --git a/UploadersLib/FileUploaders/Jira.cs b/ShareX.UploadersLib/FileUploaders/Jira.cs
similarity index 100%
rename from UploadersLib/FileUploaders/Jira.cs
rename to ShareX.UploadersLib/FileUploaders/Jira.cs
diff --git a/UploadersLib/FileUploaders/Localhost/LocalhostAccount.cs b/ShareX.UploadersLib/FileUploaders/Localhost/LocalhostAccount.cs
similarity index 100%
rename from UploadersLib/FileUploaders/Localhost/LocalhostAccount.cs
rename to ShareX.UploadersLib/FileUploaders/Localhost/LocalhostAccount.cs
diff --git a/UploadersLib/FileUploaders/MediaCrushUploader.cs b/ShareX.UploadersLib/FileUploaders/MediaCrushUploader.cs
similarity index 100%
rename from UploadersLib/FileUploaders/MediaCrushUploader.cs
rename to ShareX.UploadersLib/FileUploaders/MediaCrushUploader.cs
diff --git a/UploadersLib/FileUploaders/MediaFire.cs b/ShareX.UploadersLib/FileUploaders/MediaFire.cs
similarity index 100%
rename from UploadersLib/FileUploaders/MediaFire.cs
rename to ShareX.UploadersLib/FileUploaders/MediaFire.cs
diff --git a/UploadersLib/FileUploaders/Mega.cs b/ShareX.UploadersLib/FileUploaders/Mega.cs
similarity index 100%
rename from UploadersLib/FileUploaders/Mega.cs
rename to ShareX.UploadersLib/FileUploaders/Mega.cs
diff --git a/UploadersLib/FileUploaders/Minus.cs b/ShareX.UploadersLib/FileUploaders/Minus.cs
similarity index 100%
rename from UploadersLib/FileUploaders/Minus.cs
rename to ShareX.UploadersLib/FileUploaders/Minus.cs
diff --git a/UploadersLib/FileUploaders/OneDrive.cs b/ShareX.UploadersLib/FileUploaders/OneDrive.cs
similarity index 97%
rename from UploadersLib/FileUploaders/OneDrive.cs
rename to ShareX.UploadersLib/FileUploaders/OneDrive.cs
index 599f67a63..6e8645d00 100644
--- a/UploadersLib/FileUploaders/OneDrive.cs
+++ b/ShareX.UploadersLib/FileUploaders/OneDrive.cs
@@ -1,166 +1,166 @@
-#region License Information (GPL v3)
-
-/*
-    ShareX - A program that allows you to take screenshots and share any file type
-    Copyright (C) 2007-2014 ShareX Developers
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-    Optionally you can also view the license at <http://www.gnu.org/licenses/>.
-*/
-
-#endregion License Information (GPL v3)
-
-// Credits: https://github.com/l0nley
-
-using Newtonsoft.Json;
-using System.Collections.Generic;
-using System.IO;
-using UploadersLib.HelperClasses;
-
-namespace UploadersLib.FileUploaders
-{
-    public sealed class OneDrive : FileUploader, IOAuth2
-    {
-        public OAuth2Info AuthInfo { get; private set; }
-
-        public string FolderID { get; set; }
-
-        public OneDrive(OAuth2Info authInfo)
-        {
-            AuthInfo = authInfo;
-        }
-
-        public override UploadResult Upload(Stream stream, string fileName)
-        {
-            if (!CheckAuthorization())
-            {
-                return null;
-            }
-
-            if (string.IsNullOrEmpty(FolderID))
-            {
-                FolderID = "me/skydrive/files";
-            }
-
-            Dictionary<string, string> args = new Dictionary<string, string>();
-            args.Add("access_token", AuthInfo.Token.access_token);
-            args.Add("overwrite", "true");
-
-            string url = string.Format("https://apis.live.net/v5.0/{0}/{1}", FolderID, fileName);
-            UploadResult result = UploadData(stream, url, string.Empty, arguments: args, method: HttpMethod.PUT);
-
-            if (result.IsSuccess)
-            {
-                OneDriveUploadInfo resultJson = JsonConvert.DeserializeObject<OneDriveUploadInfo>(result.Response);
-                result.URL = resultJson.source;
-            }
-
-            return result;
-        }
-
-        public string GetAuthorizationURL()
-        {
-            Dictionary<string, string> args = new Dictionary<string, string>();
-            args.Add("response_type", "code");
-            args.Add("client_id", AuthInfo.Client_ID);
-            args.Add("scope", "wl.skydrive_update");
-
-            return CreateQuery("https://login.live.com/oauth20_authorize.srf", args);
-        }
-
-        public bool GetAccessToken(string code)
-        {
-            Dictionary<string, string> args = new Dictionary<string, string>();
-            args.Add("grant_type", "authorization_code");
-            args.Add("code", code);
-            args.Add("client_id", AuthInfo.Client_ID);
-            args.Add("client_secret", AuthInfo.Client_Secret);
-
-            string response = SendRequest(HttpMethod.POST, "https://login.live.com/oauth20_token.srf", args);
-
-            if (string.IsNullOrEmpty(response))
-            {
-                return false;
-            }
-
-            OAuth2Token token = JsonConvert.DeserializeObject<OAuth2Token>(response);
-
-            if (token == null || string.IsNullOrEmpty(token.access_token))
-            {
-                return false;
-            }
-
-            token.UpdateExpireDate();
-            AuthInfo.Token = token;
-            return true;
-        }
-
-        public bool RefreshAccessToken()
-        {
-            if (!OAuth2Info.CheckOAuth(AuthInfo) || string.IsNullOrEmpty(AuthInfo.Token.refresh_token))
-            {
-                return false;
-            }
-
-            Dictionary<string, string> args = new Dictionary<string, string>();
-            args.Add("grant_type", "refresh_token");
-            args.Add("refresh_token", AuthInfo.Token.refresh_token);
-            args.Add("client_id", AuthInfo.Client_ID);
-            args.Add("client_secret", AuthInfo.Client_Secret);
-
-            string response = SendRequest(HttpMethod.POST, "https://login.live.com/oauth20_token.srf", args);
-
-            if (string.IsNullOrEmpty(response))
-            {
-                return false;
-            }
-
-            OAuth2Token token = JsonConvert.DeserializeObject<OAuth2Token>(response);
-
-            if (token == null || string.IsNullOrEmpty(token.access_token))
-            {
-                return false;
-            }
-
-            token.UpdateExpireDate();
-            AuthInfo.Token = token;
-            return true;
-        }
-
-        public bool CheckAuthorization()
-        {
-            if (OAuth2Info.CheckOAuth(AuthInfo))
-            {
-                if (!AuthInfo.Token.IsExpired || RefreshAccessToken())
-                {
-                    return true;
-                }
-
-                Errors.Add("Refresh access token failed.");
-                return false;
-            }
-
-            Errors.Add("OneDrive login is required.");
-            return false;
-        }
-    }
-
-    internal sealed class OneDriveUploadInfo
-    {
-        public string id { get; set; }
-        public string source { get; set; }
-    }
+#region License Information (GPL v3)
+
+/*
+    ShareX - A program that allows you to take screenshots and share any file type
+    Copyright (C) 2007-2014 ShareX Developers
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+    Optionally you can also view the license at <http://www.gnu.org/licenses/>.
+*/
+
+#endregion License Information (GPL v3)
+
+// Credits: https://github.com/l0nley
+
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.IO;
+using UploadersLib.HelperClasses;
+
+namespace UploadersLib.FileUploaders
+{
+    public sealed class OneDrive : FileUploader, IOAuth2
+    {
+        public OAuth2Info AuthInfo { get; private set; }
+
+        public string FolderID { get; set; }
+
+        public OneDrive(OAuth2Info authInfo)
+        {
+            AuthInfo = authInfo;
+        }
+
+        public override UploadResult Upload(Stream stream, string fileName)
+        {
+            if (!CheckAuthorization())
+            {
+                return null;
+            }
+
+            if (string.IsNullOrEmpty(FolderID))
+            {
+                FolderID = "me/skydrive/files";
+            }
+
+            Dictionary<string, string> args = new Dictionary<string, string>();
+            args.Add("access_token", AuthInfo.Token.access_token);
+            args.Add("overwrite", "true");
+
+            string url = string.Format("https://apis.live.net/v5.0/{0}/{1}", FolderID, fileName);
+            UploadResult result = UploadData(stream, url, string.Empty, arguments: args, method: HttpMethod.PUT);
+
+            if (result.IsSuccess)
+            {
+                OneDriveUploadInfo resultJson = JsonConvert.DeserializeObject<OneDriveUploadInfo>(result.Response);
+                result.URL = resultJson.source;
+            }
+
+            return result;
+        }
+
+        public string GetAuthorizationURL()
+        {
+            Dictionary<string, string> args = new Dictionary<string, string>();
+            args.Add("response_type", "code");
+            args.Add("client_id", AuthInfo.Client_ID);
+            args.Add("scope", "wl.skydrive_update");
+
+            return CreateQuery("https://login.live.com/oauth20_authorize.srf", args);
+        }
+
+        public bool GetAccessToken(string code)
+        {
+            Dictionary<string, string> args = new Dictionary<string, string>();
+            args.Add("grant_type", "authorization_code");
+            args.Add("code", code);
+            args.Add("client_id", AuthInfo.Client_ID);
+            args.Add("client_secret", AuthInfo.Client_Secret);
+
+            string response = SendRequest(HttpMethod.POST, "https://login.live.com/oauth20_token.srf", args);
+
+            if (string.IsNullOrEmpty(response))
+            {
+                return false;
+            }
+
+            OAuth2Token token = JsonConvert.DeserializeObject<OAuth2Token>(response);
+
+            if (token == null || string.IsNullOrEmpty(token.access_token))
+            {
+                return false;
+            }
+
+            token.UpdateExpireDate();
+            AuthInfo.Token = token;
+            return true;
+        }
+
+        public bool RefreshAccessToken()
+        {
+            if (!OAuth2Info.CheckOAuth(AuthInfo) || string.IsNullOrEmpty(AuthInfo.Token.refresh_token))
+            {
+                return false;
+            }
+
+            Dictionary<string, string> args = new Dictionary<string, string>();
+            args.Add("grant_type", "refresh_token");
+            args.Add("refresh_token", AuthInfo.Token.refresh_token);
+            args.Add("client_id", AuthInfo.Client_ID);
+            args.Add("client_secret", AuthInfo.Client_Secret);
+
+            string response = SendRequest(HttpMethod.POST, "https://login.live.com/oauth20_token.srf", args);
+
+            if (string.IsNullOrEmpty(response))
+            {
+                return false;
+            }
+
+            OAuth2Token token = JsonConvert.DeserializeObject<OAuth2Token>(response);
+
+            if (token == null || string.IsNullOrEmpty(token.access_token))
+            {
+                return false;
+            }
+
+            token.UpdateExpireDate();
+            AuthInfo.Token = token;
+            return true;
+        }
+
+        public bool CheckAuthorization()
+        {
+            if (OAuth2Info.CheckOAuth(AuthInfo))
+            {
+                if (!AuthInfo.Token.IsExpired || RefreshAccessToken())
+                {
+                    return true;
+                }
+
+                Errors.Add("Refresh access token failed.");
+                return false;
+            }
+
+            Errors.Add("OneDrive login is required.");
+            return false;
+        }
+    }
+
+    internal sealed class OneDriveUploadInfo
+    {
+        public string id { get; set; }
+        public string source { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/UploadersLib/FileUploaders/OwnCloud.cs b/ShareX.UploadersLib/FileUploaders/OwnCloud.cs
similarity index 100%
rename from UploadersLib/FileUploaders/OwnCloud.cs
rename to ShareX.UploadersLib/FileUploaders/OwnCloud.cs
diff --git a/UploadersLib/FileUploaders/Pomf.cs b/ShareX.UploadersLib/FileUploaders/Pomf.cs
similarity index 100%
rename from UploadersLib/FileUploaders/Pomf.cs
rename to ShareX.UploadersLib/FileUploaders/Pomf.cs
diff --git a/UploadersLib/FileUploaders/Pushbullet.cs b/ShareX.UploadersLib/FileUploaders/Pushbullet.cs
similarity index 100%
rename from UploadersLib/FileUploaders/Pushbullet.cs
rename to ShareX.UploadersLib/FileUploaders/Pushbullet.cs
diff --git a/UploadersLib/FileUploaders/RapidShare.cs b/ShareX.UploadersLib/FileUploaders/RapidShare.cs
similarity index 100%
rename from UploadersLib/FileUploaders/RapidShare.cs
rename to ShareX.UploadersLib/FileUploaders/RapidShare.cs
diff --git a/UploadersLib/FileUploaders/SFTP.cs b/ShareX.UploadersLib/FileUploaders/SFTP.cs
similarity index 100%
rename from UploadersLib/FileUploaders/SFTP.cs
rename to ShareX.UploadersLib/FileUploaders/SFTP.cs
diff --git a/UploadersLib/FileUploaders/SendSpace.cs b/ShareX.UploadersLib/FileUploaders/SendSpace.cs
similarity index 100%
rename from UploadersLib/FileUploaders/SendSpace.cs
rename to ShareX.UploadersLib/FileUploaders/SendSpace.cs
diff --git a/UploadersLib/FileUploaders/SendSpaceManager.cs b/ShareX.UploadersLib/FileUploaders/SendSpaceManager.cs
similarity index 100%
rename from UploadersLib/FileUploaders/SendSpaceManager.cs
rename to ShareX.UploadersLib/FileUploaders/SendSpaceManager.cs
diff --git a/UploadersLib/FileUploaders/ShareCX.cs b/ShareX.UploadersLib/FileUploaders/ShareCX.cs
similarity index 100%
rename from UploadersLib/FileUploaders/ShareCX.cs
rename to ShareX.UploadersLib/FileUploaders/ShareCX.cs
diff --git a/UploadersLib/FileUploaders/SharedFolderUploader.cs b/ShareX.UploadersLib/FileUploaders/SharedFolderUploader.cs
similarity index 100%
rename from UploadersLib/FileUploaders/SharedFolderUploader.cs
rename to ShareX.UploadersLib/FileUploaders/SharedFolderUploader.cs
diff --git a/UploadersLib/Forms/DropboxFilesForm.Designer.cs b/ShareX.UploadersLib/Forms/DropboxFilesForm.Designer.cs
similarity index 100%
rename from UploadersLib/Forms/DropboxFilesForm.Designer.cs
rename to ShareX.UploadersLib/Forms/DropboxFilesForm.Designer.cs
diff --git a/UploadersLib/Forms/DropboxFilesForm.cs b/ShareX.UploadersLib/Forms/DropboxFilesForm.cs
similarity index 100%
rename from UploadersLib/Forms/DropboxFilesForm.cs
rename to ShareX.UploadersLib/Forms/DropboxFilesForm.cs
diff --git a/UploadersLib/Forms/DropboxFilesForm.resx b/ShareX.UploadersLib/Forms/DropboxFilesForm.resx
similarity index 100%
rename from UploadersLib/Forms/DropboxFilesForm.resx
rename to ShareX.UploadersLib/Forms/DropboxFilesForm.resx
diff --git a/UploadersLib/Forms/DropboxFilesForm.tr.resx b/ShareX.UploadersLib/Forms/DropboxFilesForm.tr.resx
similarity index 100%
rename from UploadersLib/Forms/DropboxFilesForm.tr.resx
rename to ShareX.UploadersLib/Forms/DropboxFilesForm.tr.resx
diff --git a/UploadersLib/Forms/EmailForm.Designer.cs b/ShareX.UploadersLib/Forms/EmailForm.Designer.cs
similarity index 100%
rename from UploadersLib/Forms/EmailForm.Designer.cs
rename to ShareX.UploadersLib/Forms/EmailForm.Designer.cs
diff --git a/UploadersLib/Forms/EmailForm.cs b/ShareX.UploadersLib/Forms/EmailForm.cs
similarity index 100%
rename from UploadersLib/Forms/EmailForm.cs
rename to ShareX.UploadersLib/Forms/EmailForm.cs
diff --git a/UploadersLib/Forms/EmailForm.resx b/ShareX.UploadersLib/Forms/EmailForm.resx
similarity index 100%
rename from UploadersLib/Forms/EmailForm.resx
rename to ShareX.UploadersLib/Forms/EmailForm.resx
diff --git a/UploadersLib/Forms/EmailForm.tr.resx b/ShareX.UploadersLib/Forms/EmailForm.tr.resx
similarity index 100%
rename from UploadersLib/Forms/EmailForm.tr.resx
rename to ShareX.UploadersLib/Forms/EmailForm.tr.resx
diff --git a/UploadersLib/Forms/JiraUpload.Designer.cs b/ShareX.UploadersLib/Forms/JiraUpload.Designer.cs
similarity index 100%
rename from UploadersLib/Forms/JiraUpload.Designer.cs
rename to ShareX.UploadersLib/Forms/JiraUpload.Designer.cs
diff --git a/UploadersLib/Forms/JiraUpload.cs b/ShareX.UploadersLib/Forms/JiraUpload.cs
similarity index 100%
rename from UploadersLib/Forms/JiraUpload.cs
rename to ShareX.UploadersLib/Forms/JiraUpload.cs
diff --git a/UploadersLib/Forms/JiraUpload.resx b/ShareX.UploadersLib/Forms/JiraUpload.resx
similarity index 100%
rename from UploadersLib/Forms/JiraUpload.resx
rename to ShareX.UploadersLib/Forms/JiraUpload.resx
diff --git a/UploadersLib/Forms/JiraUpload.tr.resx b/ShareX.UploadersLib/Forms/JiraUpload.tr.resx
similarity index 100%
rename from UploadersLib/Forms/JiraUpload.tr.resx
rename to ShareX.UploadersLib/Forms/JiraUpload.tr.resx
diff --git a/UploadersLib/Forms/OAuthWebForm.Designer.cs b/ShareX.UploadersLib/Forms/OAuthWebForm.Designer.cs
similarity index 100%
rename from UploadersLib/Forms/OAuthWebForm.Designer.cs
rename to ShareX.UploadersLib/Forms/OAuthWebForm.Designer.cs
diff --git a/UploadersLib/Forms/OAuthWebForm.cs b/ShareX.UploadersLib/Forms/OAuthWebForm.cs
similarity index 100%
rename from UploadersLib/Forms/OAuthWebForm.cs
rename to ShareX.UploadersLib/Forms/OAuthWebForm.cs
diff --git a/UploadersLib/Forms/OAuthWebForm.resx b/ShareX.UploadersLib/Forms/OAuthWebForm.resx
similarity index 100%
rename from UploadersLib/Forms/OAuthWebForm.resx
rename to ShareX.UploadersLib/Forms/OAuthWebForm.resx
diff --git a/UploadersLib/Forms/OAuthWebForm.tr.resx b/ShareX.UploadersLib/Forms/OAuthWebForm.tr.resx
similarity index 100%
rename from UploadersLib/Forms/OAuthWebForm.tr.resx
rename to ShareX.UploadersLib/Forms/OAuthWebForm.tr.resx
diff --git a/UploadersLib/Forms/ResponseForm.Designer.cs b/ShareX.UploadersLib/Forms/ResponseForm.Designer.cs
similarity index 100%
rename from UploadersLib/Forms/ResponseForm.Designer.cs
rename to ShareX.UploadersLib/Forms/ResponseForm.Designer.cs
diff --git a/UploadersLib/Forms/ResponseForm.cs b/ShareX.UploadersLib/Forms/ResponseForm.cs
similarity index 100%
rename from UploadersLib/Forms/ResponseForm.cs
rename to ShareX.UploadersLib/Forms/ResponseForm.cs
diff --git a/UploadersLib/Forms/ResponseForm.resx b/ShareX.UploadersLib/Forms/ResponseForm.resx
similarity index 100%
rename from UploadersLib/Forms/ResponseForm.resx
rename to ShareX.UploadersLib/Forms/ResponseForm.resx
diff --git a/UploadersLib/Forms/ResponseForm.tr.resx b/ShareX.UploadersLib/Forms/ResponseForm.tr.resx
similarity index 100%
rename from UploadersLib/Forms/ResponseForm.tr.resx
rename to ShareX.UploadersLib/Forms/ResponseForm.tr.resx
diff --git a/UploadersLib/Forms/TwitterTweetForm.Designer.cs b/ShareX.UploadersLib/Forms/TwitterTweetForm.Designer.cs
similarity index 100%
rename from UploadersLib/Forms/TwitterTweetForm.Designer.cs
rename to ShareX.UploadersLib/Forms/TwitterTweetForm.Designer.cs
diff --git a/UploadersLib/Forms/TwitterTweetForm.cs b/ShareX.UploadersLib/Forms/TwitterTweetForm.cs
similarity index 100%
rename from UploadersLib/Forms/TwitterTweetForm.cs
rename to ShareX.UploadersLib/Forms/TwitterTweetForm.cs
diff --git a/UploadersLib/Forms/TwitterTweetForm.resx b/ShareX.UploadersLib/Forms/TwitterTweetForm.resx
similarity index 100%
rename from UploadersLib/Forms/TwitterTweetForm.resx
rename to ShareX.UploadersLib/Forms/TwitterTweetForm.resx
diff --git a/UploadersLib/Forms/TwitterTweetForm.tr.resx b/ShareX.UploadersLib/Forms/TwitterTweetForm.tr.resx
similarity index 100%
rename from UploadersLib/Forms/TwitterTweetForm.tr.resx
rename to ShareX.UploadersLib/Forms/TwitterTweetForm.tr.resx
diff --git a/UploadersLib/Forms/UploadersConfigForm.Designer.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs
similarity index 100%
rename from UploadersLib/Forms/UploadersConfigForm.Designer.cs
rename to ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs
diff --git a/UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs
similarity index 100%
rename from UploadersLib/Forms/UploadersConfigForm.cs
rename to ShareX.UploadersLib/Forms/UploadersConfigForm.cs
diff --git a/UploadersLib/Forms/UploadersConfigForm.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx
similarity index 100%
rename from UploadersLib/Forms/UploadersConfigForm.resx
rename to ShareX.UploadersLib/Forms/UploadersConfigForm.resx
diff --git a/UploadersLib/Forms/UploadersConfigForm.tr.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.tr.resx
similarity index 100%
rename from UploadersLib/Forms/UploadersConfigForm.tr.resx
rename to ShareX.UploadersLib/Forms/UploadersConfigForm.tr.resx
diff --git a/UploadersLib/Forms/UploadersConfigFormHelper.cs b/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs
similarity index 100%
rename from UploadersLib/Forms/UploadersConfigFormHelper.cs
rename to ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs
diff --git a/UploadersLib/Forms/UserPassBox.Designer.cs b/ShareX.UploadersLib/Forms/UserPassBox.Designer.cs
similarity index 100%
rename from UploadersLib/Forms/UserPassBox.Designer.cs
rename to ShareX.UploadersLib/Forms/UserPassBox.Designer.cs
diff --git a/UploadersLib/Forms/UserPassBox.cs b/ShareX.UploadersLib/Forms/UserPassBox.cs
similarity index 100%
rename from UploadersLib/Forms/UserPassBox.cs
rename to ShareX.UploadersLib/Forms/UserPassBox.cs
diff --git a/UploadersLib/Forms/UserPassBox.resx b/ShareX.UploadersLib/Forms/UserPassBox.resx
similarity index 100%
rename from UploadersLib/Forms/UserPassBox.resx
rename to ShareX.UploadersLib/Forms/UserPassBox.resx
diff --git a/UploadersLib/Forms/UserPassBox.tr.resx b/ShareX.UploadersLib/Forms/UserPassBox.tr.resx
similarity index 100%
rename from UploadersLib/Forms/UserPassBox.tr.resx
rename to ShareX.UploadersLib/Forms/UserPassBox.tr.resx
diff --git a/UploadersLib/HelperClasses/AccountInfo.cs b/ShareX.UploadersLib/HelperClasses/AccountInfo.cs
similarity index 100%
rename from UploadersLib/HelperClasses/AccountInfo.cs
rename to ShareX.UploadersLib/HelperClasses/AccountInfo.cs
diff --git a/UploadersLib/HelperClasses/Argument.cs b/ShareX.UploadersLib/HelperClasses/Argument.cs
similarity index 100%
rename from UploadersLib/HelperClasses/Argument.cs
rename to ShareX.UploadersLib/HelperClasses/Argument.cs
diff --git a/UploadersLib/HelperClasses/CertFileNameEditor.cs b/ShareX.UploadersLib/HelperClasses/CertFileNameEditor.cs
similarity index 100%
rename from UploadersLib/HelperClasses/CertFileNameEditor.cs
rename to ShareX.UploadersLib/HelperClasses/CertFileNameEditor.cs
diff --git a/UploadersLib/HelperClasses/CustomUploaderItem.cs b/ShareX.UploadersLib/HelperClasses/CustomUploaderItem.cs
similarity index 100%
rename from UploadersLib/HelperClasses/CustomUploaderItem.cs
rename to ShareX.UploadersLib/HelperClasses/CustomUploaderItem.cs
diff --git a/UploadersLib/HelperClasses/CustomUploaderParse.cs b/ShareX.UploadersLib/HelperClasses/CustomUploaderParse.cs
similarity index 100%
rename from UploadersLib/HelperClasses/CustomUploaderParse.cs
rename to ShareX.UploadersLib/HelperClasses/CustomUploaderParse.cs
diff --git a/UploadersLib/HelperClasses/ImageListManager.cs b/ShareX.UploadersLib/HelperClasses/ImageListManager.cs
similarity index 100%
rename from UploadersLib/HelperClasses/ImageListManager.cs
rename to ShareX.UploadersLib/HelperClasses/ImageListManager.cs
diff --git a/UploadersLib/HelperClasses/JSONHelper.cs b/ShareX.UploadersLib/HelperClasses/JSONHelper.cs
similarity index 100%
rename from UploadersLib/HelperClasses/JSONHelper.cs
rename to ShareX.UploadersLib/HelperClasses/JSONHelper.cs
diff --git a/UploadersLib/HelperClasses/KeyFileNameEditor.cs b/ShareX.UploadersLib/HelperClasses/KeyFileNameEditor.cs
similarity index 100%
rename from UploadersLib/HelperClasses/KeyFileNameEditor.cs
rename to ShareX.UploadersLib/HelperClasses/KeyFileNameEditor.cs
diff --git a/UploadersLib/HelperClasses/OAuth/IOAuth.cs b/ShareX.UploadersLib/HelperClasses/OAuth/IOAuth.cs
similarity index 100%
rename from UploadersLib/HelperClasses/OAuth/IOAuth.cs
rename to ShareX.UploadersLib/HelperClasses/OAuth/IOAuth.cs
diff --git a/UploadersLib/HelperClasses/OAuth/IOAuth2.cs b/ShareX.UploadersLib/HelperClasses/OAuth/IOAuth2.cs
similarity index 100%
rename from UploadersLib/HelperClasses/OAuth/IOAuth2.cs
rename to ShareX.UploadersLib/HelperClasses/OAuth/IOAuth2.cs
diff --git a/UploadersLib/HelperClasses/OAuth/IOAuth2Basic.cs b/ShareX.UploadersLib/HelperClasses/OAuth/IOAuth2Basic.cs
similarity index 100%
rename from UploadersLib/HelperClasses/OAuth/IOAuth2Basic.cs
rename to ShareX.UploadersLib/HelperClasses/OAuth/IOAuth2Basic.cs
diff --git a/UploadersLib/HelperClasses/OAuth/IOAuthBase.cs b/ShareX.UploadersLib/HelperClasses/OAuth/IOAuthBase.cs
similarity index 100%
rename from UploadersLib/HelperClasses/OAuth/IOAuthBase.cs
rename to ShareX.UploadersLib/HelperClasses/OAuth/IOAuthBase.cs
diff --git a/UploadersLib/HelperClasses/OAuth/OAuth2Info.cs b/ShareX.UploadersLib/HelperClasses/OAuth/OAuth2Info.cs
similarity index 100%
rename from UploadersLib/HelperClasses/OAuth/OAuth2Info.cs
rename to ShareX.UploadersLib/HelperClasses/OAuth/OAuth2Info.cs
diff --git a/UploadersLib/HelperClasses/OAuth/OAuth2Token.cs b/ShareX.UploadersLib/HelperClasses/OAuth/OAuth2Token.cs
similarity index 100%
rename from UploadersLib/HelperClasses/OAuth/OAuth2Token.cs
rename to ShareX.UploadersLib/HelperClasses/OAuth/OAuth2Token.cs
diff --git a/UploadersLib/HelperClasses/OAuth/OAuthInfo.cs b/ShareX.UploadersLib/HelperClasses/OAuth/OAuthInfo.cs
similarity index 100%
rename from UploadersLib/HelperClasses/OAuth/OAuthInfo.cs
rename to ShareX.UploadersLib/HelperClasses/OAuth/OAuthInfo.cs
diff --git a/UploadersLib/HelperClasses/OAuth/OAuthManager.cs b/ShareX.UploadersLib/HelperClasses/OAuth/OAuthManager.cs
similarity index 100%
rename from UploadersLib/HelperClasses/OAuth/OAuthManager.cs
rename to ShareX.UploadersLib/HelperClasses/OAuth/OAuthManager.cs
diff --git a/UploadersLib/HelperClasses/ProgressManager.cs b/ShareX.UploadersLib/HelperClasses/ProgressManager.cs
similarity index 100%
rename from UploadersLib/HelperClasses/ProgressManager.cs
rename to ShareX.UploadersLib/HelperClasses/ProgressManager.cs
diff --git a/UploadersLib/HelperClasses/TCPClient.cs b/ShareX.UploadersLib/HelperClasses/TCPClient.cs
similarity index 100%
rename from UploadersLib/HelperClasses/TCPClient.cs
rename to ShareX.UploadersLib/HelperClasses/TCPClient.cs
diff --git a/UploadersLib/ImageUploader.cs b/ShareX.UploadersLib/ImageUploader.cs
similarity index 100%
rename from UploadersLib/ImageUploader.cs
rename to ShareX.UploadersLib/ImageUploader.cs
diff --git a/UploadersLib/ImageUploaders/Chevereto.cs b/ShareX.UploadersLib/ImageUploaders/Chevereto.cs
similarity index 100%
rename from UploadersLib/ImageUploaders/Chevereto.cs
rename to ShareX.UploadersLib/ImageUploaders/Chevereto.cs
diff --git a/UploadersLib/ImageUploaders/CustomImageUploader.cs b/ShareX.UploadersLib/ImageUploaders/CustomImageUploader.cs
similarity index 100%
rename from UploadersLib/ImageUploaders/CustomImageUploader.cs
rename to ShareX.UploadersLib/ImageUploaders/CustomImageUploader.cs
diff --git a/UploadersLib/ImageUploaders/FlickrUploader.cs b/ShareX.UploadersLib/ImageUploaders/FlickrUploader.cs
similarity index 100%
rename from UploadersLib/ImageUploaders/FlickrUploader.cs
rename to ShareX.UploadersLib/ImageUploaders/FlickrUploader.cs
diff --git a/UploadersLib/ImageUploaders/HizliResim.cs b/ShareX.UploadersLib/ImageUploaders/HizliResim.cs
similarity index 100%
rename from UploadersLib/ImageUploaders/HizliResim.cs
rename to ShareX.UploadersLib/ImageUploaders/HizliResim.cs
diff --git a/UploadersLib/ImageUploaders/ImageBin.cs b/ShareX.UploadersLib/ImageUploaders/ImageBin.cs
similarity index 100%
rename from UploadersLib/ImageUploaders/ImageBin.cs
rename to ShareX.UploadersLib/ImageUploaders/ImageBin.cs
diff --git a/UploadersLib/ImageUploaders/ImageShackUploader.cs b/ShareX.UploadersLib/ImageUploaders/ImageShackUploader.cs
similarity index 100%
rename from UploadersLib/ImageUploaders/ImageShackUploader.cs
rename to ShareX.UploadersLib/ImageUploaders/ImageShackUploader.cs
diff --git a/UploadersLib/ImageUploaders/Img1Uploader.cs b/ShareX.UploadersLib/ImageUploaders/Img1Uploader.cs
similarity index 100%
rename from UploadersLib/ImageUploaders/Img1Uploader.cs
rename to ShareX.UploadersLib/ImageUploaders/Img1Uploader.cs
diff --git a/UploadersLib/ImageUploaders/Imgur_v2.cs b/ShareX.UploadersLib/ImageUploaders/Imgur_v2.cs
similarity index 100%
rename from UploadersLib/ImageUploaders/Imgur_v2.cs
rename to ShareX.UploadersLib/ImageUploaders/Imgur_v2.cs
diff --git a/UploadersLib/ImageUploaders/Imgur_v3.cs b/ShareX.UploadersLib/ImageUploaders/Imgur_v3.cs
similarity index 100%
rename from UploadersLib/ImageUploaders/Imgur_v3.cs
rename to ShareX.UploadersLib/ImageUploaders/Imgur_v3.cs
diff --git a/UploadersLib/ImageUploaders/ImmioUploader.cs b/ShareX.UploadersLib/ImageUploaders/ImmioUploader.cs
similarity index 100%
rename from UploadersLib/ImageUploaders/ImmioUploader.cs
rename to ShareX.UploadersLib/ImageUploaders/ImmioUploader.cs
diff --git a/UploadersLib/ImageUploaders/Photobucket.cs b/ShareX.UploadersLib/ImageUploaders/Photobucket.cs
similarity index 100%
rename from UploadersLib/ImageUploaders/Photobucket.cs
rename to ShareX.UploadersLib/ImageUploaders/Photobucket.cs
diff --git a/UploadersLib/ImageUploaders/Picasa.cs b/ShareX.UploadersLib/ImageUploaders/Picasa.cs
similarity index 100%
rename from UploadersLib/ImageUploaders/Picasa.cs
rename to ShareX.UploadersLib/ImageUploaders/Picasa.cs
diff --git a/UploadersLib/ImageUploaders/TinyPicUploader.cs b/ShareX.UploadersLib/ImageUploaders/TinyPicUploader.cs
similarity index 100%
rename from UploadersLib/ImageUploaders/TinyPicUploader.cs
rename to ShareX.UploadersLib/ImageUploaders/TinyPicUploader.cs
diff --git a/UploadersLib/ImageUploaders/TwitPicUploader.cs b/ShareX.UploadersLib/ImageUploaders/TwitPicUploader.cs
similarity index 100%
rename from UploadersLib/ImageUploaders/TwitPicUploader.cs
rename to ShareX.UploadersLib/ImageUploaders/TwitPicUploader.cs
diff --git a/UploadersLib/ImageUploaders/TwitSnapsUploader.cs b/ShareX.UploadersLib/ImageUploaders/TwitSnapsUploader.cs
similarity index 100%
rename from UploadersLib/ImageUploaders/TwitSnapsUploader.cs
rename to ShareX.UploadersLib/ImageUploaders/TwitSnapsUploader.cs
diff --git a/UploadersLib/ImageUploaders/Twitter.cs b/ShareX.UploadersLib/ImageUploaders/Twitter.cs
similarity index 100%
rename from UploadersLib/ImageUploaders/Twitter.cs
rename to ShareX.UploadersLib/ImageUploaders/Twitter.cs
diff --git a/UploadersLib/ImageUploaders/UploadScreenshot.cs b/ShareX.UploadersLib/ImageUploaders/UploadScreenshot.cs
similarity index 100%
rename from UploadersLib/ImageUploaders/UploadScreenshot.cs
rename to ShareX.UploadersLib/ImageUploaders/UploadScreenshot.cs
diff --git a/UploadersLib/ImageUploaders/YfrogUploader.cs b/ShareX.UploadersLib/ImageUploaders/YfrogUploader.cs
similarity index 100%
rename from UploadersLib/ImageUploaders/YfrogUploader.cs
rename to ShareX.UploadersLib/ImageUploaders/YfrogUploader.cs
diff --git a/UploadersLib/OtherServices/GoogleTranslate.cs b/ShareX.UploadersLib/OtherServices/GoogleTranslate.cs
similarity index 100%
rename from UploadersLib/OtherServices/GoogleTranslate.cs
rename to ShareX.UploadersLib/OtherServices/GoogleTranslate.cs
diff --git a/UploadersLib/OtherServices/GoogleTranslatorConfig.cs b/ShareX.UploadersLib/OtherServices/GoogleTranslatorConfig.cs
similarity index 100%
rename from UploadersLib/OtherServices/GoogleTranslatorConfig.cs
rename to ShareX.UploadersLib/OtherServices/GoogleTranslatorConfig.cs
diff --git a/UploadersLib/OtherServices/Lyricsfly.cs b/ShareX.UploadersLib/OtherServices/Lyricsfly.cs
similarity index 100%
rename from UploadersLib/OtherServices/Lyricsfly.cs
rename to ShareX.UploadersLib/OtherServices/Lyricsfly.cs
diff --git a/ShareX.UploadersLib/Properties/AssemblyInfo.cs b/ShareX.UploadersLib/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..920338c8e
--- /dev/null
+++ b/ShareX.UploadersLib/Properties/AssemblyInfo.cs
@@ -0,0 +1,15 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("ShareX UploadersLib")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("ShareX Developers")]
+[assembly: AssemblyProduct("ShareX")]
+[assembly: AssemblyCopyright("Copyright (C) 2007-2014 ShareX Developers")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: ComVisible(false)]
+[assembly: Guid("61f63572-6737-4a35-bcde-d2a53861e296")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/UploadersLib/Properties/Resources.Designer.cs b/ShareX.UploadersLib/Properties/Resources.Designer.cs
similarity index 100%
rename from UploadersLib/Properties/Resources.Designer.cs
rename to ShareX.UploadersLib/Properties/Resources.Designer.cs
diff --git a/UploadersLib/Properties/Resources.resx b/ShareX.UploadersLib/Properties/Resources.resx
similarity index 100%
rename from UploadersLib/Properties/Resources.resx
rename to ShareX.UploadersLib/Properties/Resources.resx
diff --git a/UploadersLib/Properties/Resources.tr.resx b/ShareX.UploadersLib/Properties/Resources.tr.resx
similarity index 100%
rename from UploadersLib/Properties/Resources.tr.resx
rename to ShareX.UploadersLib/Properties/Resources.tr.resx
diff --git a/UploadersLib/Resources/folder-network.png b/ShareX.UploadersLib/Resources/folder-network.png
similarity index 100%
rename from UploadersLib/Resources/folder-network.png
rename to ShareX.UploadersLib/Resources/folder-network.png
diff --git a/UploadersLib/Resources/folder.gif b/ShareX.UploadersLib/Resources/folder.gif
similarity index 100%
rename from UploadersLib/Resources/folder.gif
rename to ShareX.UploadersLib/Resources/folder.gif
diff --git a/UploadersLib/Resources/folder_gray.gif b/ShareX.UploadersLib/Resources/folder_gray.gif
similarity index 100%
rename from UploadersLib/Resources/folder_gray.gif
rename to ShareX.UploadersLib/Resources/folder_gray.gif
diff --git a/UploadersLib/Resources/folder_photos.gif b/ShareX.UploadersLib/Resources/folder_photos.gif
similarity index 100%
rename from UploadersLib/Resources/folder_photos.gif
rename to ShareX.UploadersLib/Resources/folder_photos.gif
diff --git a/UploadersLib/Resources/folder_public.gif b/ShareX.UploadersLib/Resources/folder_public.gif
similarity index 100%
rename from UploadersLib/Resources/folder_public.gif
rename to ShareX.UploadersLib/Resources/folder_public.gif
diff --git a/UploadersLib/Resources/folder_star.gif b/ShareX.UploadersLib/Resources/folder_star.gif
similarity index 100%
rename from UploadersLib/Resources/folder_star.gif
rename to ShareX.UploadersLib/Resources/folder_star.gif
diff --git a/UploadersLib/Resources/folder_user.gif b/ShareX.UploadersLib/Resources/folder_user.gif
similarity index 100%
rename from UploadersLib/Resources/folder_user.gif
rename to ShareX.UploadersLib/Resources/folder_user.gif
diff --git a/UploadersLib/Resources/globe-network.png b/ShareX.UploadersLib/Resources/globe-network.png
similarity index 100%
rename from UploadersLib/Resources/globe-network.png
rename to ShareX.UploadersLib/Resources/globe-network.png
diff --git a/UploadersLib/Resources/mail.png b/ShareX.UploadersLib/Resources/mail.png
similarity index 100%
rename from UploadersLib/Resources/mail.png
rename to ShareX.UploadersLib/Resources/mail.png
diff --git a/UploadersLib/Resources/package.gif b/ShareX.UploadersLib/Resources/package.gif
similarity index 100%
rename from UploadersLib/Resources/package.gif
rename to ShareX.UploadersLib/Resources/package.gif
diff --git a/UploadersLib/Resources/page_white.gif b/ShareX.UploadersLib/Resources/page_white.gif
similarity index 100%
rename from UploadersLib/Resources/page_white.gif
rename to ShareX.UploadersLib/Resources/page_white.gif
diff --git a/UploadersLib/Resources/page_white_acrobat.gif b/ShareX.UploadersLib/Resources/page_white_acrobat.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_acrobat.gif
rename to ShareX.UploadersLib/Resources/page_white_acrobat.gif
diff --git a/UploadersLib/Resources/page_white_actionscript.gif b/ShareX.UploadersLib/Resources/page_white_actionscript.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_actionscript.gif
rename to ShareX.UploadersLib/Resources/page_white_actionscript.gif
diff --git a/UploadersLib/Resources/page_white_c.gif b/ShareX.UploadersLib/Resources/page_white_c.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_c.gif
rename to ShareX.UploadersLib/Resources/page_white_c.gif
diff --git a/UploadersLib/Resources/page_white_code.gif b/ShareX.UploadersLib/Resources/page_white_code.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_code.gif
rename to ShareX.UploadersLib/Resources/page_white_code.gif
diff --git a/UploadersLib/Resources/page_white_compressed.gif b/ShareX.UploadersLib/Resources/page_white_compressed.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_compressed.gif
rename to ShareX.UploadersLib/Resources/page_white_compressed.gif
diff --git a/UploadersLib/Resources/page_white_cplusplus.gif b/ShareX.UploadersLib/Resources/page_white_cplusplus.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_cplusplus.gif
rename to ShareX.UploadersLib/Resources/page_white_cplusplus.gif
diff --git a/UploadersLib/Resources/page_white_csharp.gif b/ShareX.UploadersLib/Resources/page_white_csharp.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_csharp.gif
rename to ShareX.UploadersLib/Resources/page_white_csharp.gif
diff --git a/UploadersLib/Resources/page_white_cup.gif b/ShareX.UploadersLib/Resources/page_white_cup.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_cup.gif
rename to ShareX.UploadersLib/Resources/page_white_cup.gif
diff --git a/UploadersLib/Resources/page_white_dvd.gif b/ShareX.UploadersLib/Resources/page_white_dvd.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_dvd.gif
rename to ShareX.UploadersLib/Resources/page_white_dvd.gif
diff --git a/UploadersLib/Resources/page_white_excel.gif b/ShareX.UploadersLib/Resources/page_white_excel.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_excel.gif
rename to ShareX.UploadersLib/Resources/page_white_excel.gif
diff --git a/UploadersLib/Resources/page_white_film.gif b/ShareX.UploadersLib/Resources/page_white_film.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_film.gif
rename to ShareX.UploadersLib/Resources/page_white_film.gif
diff --git a/UploadersLib/Resources/page_white_flash.gif b/ShareX.UploadersLib/Resources/page_white_flash.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_flash.gif
rename to ShareX.UploadersLib/Resources/page_white_flash.gif
diff --git a/UploadersLib/Resources/page_white_gear.gif b/ShareX.UploadersLib/Resources/page_white_gear.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_gear.gif
rename to ShareX.UploadersLib/Resources/page_white_gear.gif
diff --git a/UploadersLib/Resources/page_white_paint.gif b/ShareX.UploadersLib/Resources/page_white_paint.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_paint.gif
rename to ShareX.UploadersLib/Resources/page_white_paint.gif
diff --git a/UploadersLib/Resources/page_white_php.gif b/ShareX.UploadersLib/Resources/page_white_php.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_php.gif
rename to ShareX.UploadersLib/Resources/page_white_php.gif
diff --git a/UploadersLib/Resources/page_white_picture.gif b/ShareX.UploadersLib/Resources/page_white_picture.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_picture.gif
rename to ShareX.UploadersLib/Resources/page_white_picture.gif
diff --git a/UploadersLib/Resources/page_white_powerpoint.gif b/ShareX.UploadersLib/Resources/page_white_powerpoint.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_powerpoint.gif
rename to ShareX.UploadersLib/Resources/page_white_powerpoint.gif
diff --git a/UploadersLib/Resources/page_white_ruby.gif b/ShareX.UploadersLib/Resources/page_white_ruby.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_ruby.gif
rename to ShareX.UploadersLib/Resources/page_white_ruby.gif
diff --git a/UploadersLib/Resources/page_white_sound.gif b/ShareX.UploadersLib/Resources/page_white_sound.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_sound.gif
rename to ShareX.UploadersLib/Resources/page_white_sound.gif
diff --git a/UploadersLib/Resources/page_white_text.gif b/ShareX.UploadersLib/Resources/page_white_text.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_text.gif
rename to ShareX.UploadersLib/Resources/page_white_text.gif
diff --git a/UploadersLib/Resources/page_white_tux.gif b/ShareX.UploadersLib/Resources/page_white_tux.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_tux.gif
rename to ShareX.UploadersLib/Resources/page_white_tux.gif
diff --git a/UploadersLib/Resources/page_white_vector.gif b/ShareX.UploadersLib/Resources/page_white_vector.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_vector.gif
rename to ShareX.UploadersLib/Resources/page_white_vector.gif
diff --git a/UploadersLib/Resources/page_white_visualstudio.gif b/ShareX.UploadersLib/Resources/page_white_visualstudio.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_visualstudio.gif
rename to ShareX.UploadersLib/Resources/page_white_visualstudio.gif
diff --git a/UploadersLib/Resources/page_white_word.gif b/ShareX.UploadersLib/Resources/page_white_word.gif
similarity index 100%
rename from UploadersLib/Resources/page_white_word.gif
rename to ShareX.UploadersLib/Resources/page_white_word.gif
diff --git a/UploadersLib/Resources/server-network.png b/ShareX.UploadersLib/Resources/server-network.png
similarity index 100%
rename from UploadersLib/Resources/server-network.png
rename to ShareX.UploadersLib/Resources/server-network.png
diff --git a/UploadersLib/UploadersLib.csproj b/ShareX.UploadersLib/ShareX.UploadersLib.csproj
similarity index 99%
rename from UploadersLib/UploadersLib.csproj
rename to ShareX.UploadersLib/ShareX.UploadersLib.csproj
index 8504a5ba6..42da8a075 100644
--- a/UploadersLib/UploadersLib.csproj
+++ b/ShareX.UploadersLib/ShareX.UploadersLib.csproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UploadersLib</RootNamespace>
-    <AssemblyName>UploadersLib</AssemblyName>
+    <AssemblyName>ShareX.UploadersLib</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>false</SignAssembly>
@@ -451,9 +451,9 @@
     <None Include="Resources\page_white_ruby.gif" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\HelpersLib\HelpersLib.csproj">
+    <ProjectReference Include="..\ShareX.HelpersLib\ShareX.HelpersLib.csproj">
       <Project>{327750E1-9FB7-4CC3-8AEA-9BC42180CAD3}</Project>
-      <Name>HelpersLib</Name>
+      <Name>ShareX.HelpersLib</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/ShareX.UploadersLib/ShareX.UploadersLib.csproj.DotSettings b/ShareX.UploadersLib/ShareX.UploadersLib.csproj.DotSettings
new file mode 100644
index 000000000..a99420329
--- /dev/null
+++ b/ShareX.UploadersLib/ShareX.UploadersLib.csproj.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeEditing/Localization/LocalizableInspector/@EntryValue">Pessimistic</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/UploadersLib/TextUploader.cs b/ShareX.UploadersLib/TextUploader.cs
similarity index 100%
rename from UploadersLib/TextUploader.cs
rename to ShareX.UploadersLib/TextUploader.cs
diff --git a/UploadersLib/TextUploaders/CustomTextUploader.cs b/ShareX.UploadersLib/TextUploaders/CustomTextUploader.cs
similarity index 100%
rename from UploadersLib/TextUploaders/CustomTextUploader.cs
rename to ShareX.UploadersLib/TextUploaders/CustomTextUploader.cs
diff --git a/UploadersLib/TextUploaders/Gist.cs b/ShareX.UploadersLib/TextUploaders/Gist.cs
similarity index 100%
rename from UploadersLib/TextUploaders/Gist.cs
rename to ShareX.UploadersLib/TextUploaders/Gist.cs
diff --git a/UploadersLib/TextUploaders/Hastebin.cs b/ShareX.UploadersLib/TextUploaders/Hastebin.cs
similarity index 100%
rename from UploadersLib/TextUploaders/Hastebin.cs
rename to ShareX.UploadersLib/TextUploaders/Hastebin.cs
diff --git a/UploadersLib/TextUploaders/Paste2.cs b/ShareX.UploadersLib/TextUploaders/Paste2.cs
similarity index 100%
rename from UploadersLib/TextUploaders/Paste2.cs
rename to ShareX.UploadersLib/TextUploaders/Paste2.cs
diff --git a/UploadersLib/TextUploaders/Paste_ee.cs b/ShareX.UploadersLib/TextUploaders/Paste_ee.cs
similarity index 100%
rename from UploadersLib/TextUploaders/Paste_ee.cs
rename to ShareX.UploadersLib/TextUploaders/Paste_ee.cs
diff --git a/UploadersLib/TextUploaders/Pastebin.cs b/ShareX.UploadersLib/TextUploaders/Pastebin.cs
similarity index 100%
rename from UploadersLib/TextUploaders/Pastebin.cs
rename to ShareX.UploadersLib/TextUploaders/Pastebin.cs
diff --git a/UploadersLib/TextUploaders/Pastebin_ca.cs b/ShareX.UploadersLib/TextUploaders/Pastebin_ca.cs
similarity index 100%
rename from UploadersLib/TextUploaders/Pastebin_ca.cs
rename to ShareX.UploadersLib/TextUploaders/Pastebin_ca.cs
diff --git a/UploadersLib/TextUploaders/Pastee.cs b/ShareX.UploadersLib/TextUploaders/Pastee.cs
similarity index 100%
rename from UploadersLib/TextUploaders/Pastee.cs
rename to ShareX.UploadersLib/TextUploaders/Pastee.cs
diff --git a/UploadersLib/TextUploaders/Slexy.cs b/ShareX.UploadersLib/TextUploaders/Slexy.cs
similarity index 100%
rename from UploadersLib/TextUploaders/Slexy.cs
rename to ShareX.UploadersLib/TextUploaders/Slexy.cs
diff --git a/UploadersLib/TextUploaders/Upaste.cs b/ShareX.UploadersLib/TextUploaders/Upaste.cs
similarity index 100%
rename from UploadersLib/TextUploaders/Upaste.cs
rename to ShareX.UploadersLib/TextUploaders/Upaste.cs
diff --git a/UploadersLib/URLShortener.cs b/ShareX.UploadersLib/URLShortener.cs
similarity index 100%
rename from UploadersLib/URLShortener.cs
rename to ShareX.UploadersLib/URLShortener.cs
diff --git a/UploadersLib/URLShorteners/AdflyURLShortener.cs b/ShareX.UploadersLib/URLShorteners/AdFlyURLShortener.cs
similarity index 100%
rename from UploadersLib/URLShorteners/AdflyURLShortener.cs
rename to ShareX.UploadersLib/URLShorteners/AdFlyURLShortener.cs
diff --git a/UploadersLib/URLShorteners/BitlyURLShortener.cs b/ShareX.UploadersLib/URLShorteners/BitlyURLShortener.cs
similarity index 100%
rename from UploadersLib/URLShorteners/BitlyURLShortener.cs
rename to ShareX.UploadersLib/URLShorteners/BitlyURLShortener.cs
diff --git a/UploadersLib/URLShorteners/CustomURLShortener.cs b/ShareX.UploadersLib/URLShorteners/CustomURLShortener.cs
similarity index 100%
rename from UploadersLib/URLShorteners/CustomURLShortener.cs
rename to ShareX.UploadersLib/URLShorteners/CustomURLShortener.cs
diff --git a/UploadersLib/URLShorteners/GoogleURLShortener.cs b/ShareX.UploadersLib/URLShorteners/GoogleURLShortener.cs
similarity index 100%
rename from UploadersLib/URLShorteners/GoogleURLShortener.cs
rename to ShareX.UploadersLib/URLShorteners/GoogleURLShortener.cs
diff --git a/UploadersLib/URLShorteners/IsgdURLShortener.cs b/ShareX.UploadersLib/URLShorteners/IsgdURLShortener.cs
similarity index 100%
rename from UploadersLib/URLShorteners/IsgdURLShortener.cs
rename to ShareX.UploadersLib/URLShorteners/IsgdURLShortener.cs
diff --git a/UploadersLib/URLShorteners/NlcmURLShortener.cs b/ShareX.UploadersLib/URLShorteners/NlcmURLShortener.cs
similarity index 100%
rename from UploadersLib/URLShorteners/NlcmURLShortener.cs
rename to ShareX.UploadersLib/URLShorteners/NlcmURLShortener.cs
diff --git a/UploadersLib/URLShorteners/TinyURLShortener.cs b/ShareX.UploadersLib/URLShorteners/TinyURLShortener.cs
similarity index 100%
rename from UploadersLib/URLShorteners/TinyURLShortener.cs
rename to ShareX.UploadersLib/URLShorteners/TinyURLShortener.cs
diff --git a/UploadersLib/URLShorteners/TurlURLShortener.cs b/ShareX.UploadersLib/URLShorteners/TurlURLShortener.cs
similarity index 100%
rename from UploadersLib/URLShorteners/TurlURLShortener.cs
rename to ShareX.UploadersLib/URLShorteners/TurlURLShortener.cs
diff --git a/UploadersLib/URLShorteners/YourlsURLShortener.cs b/ShareX.UploadersLib/URLShorteners/YourlsURLShortener.cs
similarity index 100%
rename from UploadersLib/URLShorteners/YourlsURLShortener.cs
rename to ShareX.UploadersLib/URLShorteners/YourlsURLShortener.cs
diff --git a/UploadersLib/UploadResult.cs b/ShareX.UploadersLib/UploadResult.cs
similarity index 100%
rename from UploadersLib/UploadResult.cs
rename to ShareX.UploadersLib/UploadResult.cs
diff --git a/UploadersLib/Uploader.cs b/ShareX.UploadersLib/Uploader.cs
similarity index 100%
rename from UploadersLib/Uploader.cs
rename to ShareX.UploadersLib/Uploader.cs
diff --git a/UploadersLib/UploadersConfig.cs b/ShareX.UploadersLib/UploadersConfig.cs
similarity index 100%
rename from UploadersLib/UploadersConfig.cs
rename to ShareX.UploadersLib/UploadersConfig.cs
diff --git a/UploadersLib/UploadersLib.csproj.DotSettings b/ShareX.UploadersLib/UploadersLib.csproj.DotSettings
similarity index 100%
rename from UploadersLib/UploadersLib.csproj.DotSettings
rename to ShareX.UploadersLib/UploadersLib.csproj.DotSettings
diff --git a/UploadersLib/packages.config b/ShareX.UploadersLib/packages.config
similarity index 100%
rename from UploadersLib/packages.config
rename to ShareX.UploadersLib/packages.config
diff --git a/ShareX.sln b/ShareX.sln
index 9a4bd58c4..c2b6859b7 100644
--- a/ShareX.sln
+++ b/ShareX.sln
@@ -1,23 +1,23 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShareX", "ShareX\ShareX.csproj", "{C5AE4585-E9EC-4FA3-B75A-E1210635ACB6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HistoryLib", "HistoryLib\HistoryLib.csproj", "{E7DE6237-AEA2-498B-8F56-9B392472C490}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShareX.HistoryLib", "ShareX.HistoryLib\ShareX.HistoryLib.csproj", "{E7DE6237-AEA2-498B-8F56-9B392472C490}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenCaptureLib", "ScreenCaptureLib\ScreenCaptureLib.csproj", "{DBDB0DAA-B3AE-4CC4-A8C2-20550B7F32E3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShareX.ScreenCaptureLib", "ShareX.ScreenCaptureLib\ShareX.ScreenCaptureLib.csproj", "{DBDB0DAA-B3AE-4CC4-A8C2-20550B7F32E3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelpersLib", "HelpersLib\HelpersLib.csproj", "{327750E1-9FB7-4CC3-8AEA-9BC42180CAD3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShareX.HelpersLib", "ShareX.HelpersLib\ShareX.HelpersLib.csproj", "{327750E1-9FB7-4CC3-8AEA-9BC42180CAD3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UploadersLib", "UploadersLib\UploadersLib.csproj", "{E1C94415-3424-4517-A2A1-B2FDD1F59C67}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShareX.UploadersLib", "ShareX.UploadersLib\ShareX.UploadersLib.csproj", "{E1C94415-3424-4517-A2A1-B2FDD1F59C67}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotImageEditor", "GreenshotImageEditor\GreenshotImageEditor.csproj", "{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.ImageEditor", "Greenshot.ImageEditor\Greenshot.ImageEditor.csproj", "{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IndexerLib", "IndexerLib\IndexerLib.csproj", "{750C6F46-2C5A-4488-81D3-3B35CA50F3EE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShareX.IndexerLib", "ShareX.IndexerLib\ShareX.IndexerLib.csproj", "{750C6F46-2C5A-4488-81D3-3B35CA50F3EE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageEffectsLib", "ImageEffectsLib\ImageEffectsLib.csproj", "{D13441B6-96E1-4D1B-8A95-58A7D6CB1E24}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShareX.ImageEffectsLib", "ShareX.ImageEffectsLib\ShareX.ImageEffectsLib.csproj", "{D13441B6-96E1-4D1B-8A95-58A7D6CB1E24}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{B1CCDF07-69E6-47CC-B50A-A0CD0BD58C81}"
 	ProjectSection(SolutionItems) = preProject
@@ -26,7 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{B1CCDF
 		.nuget\NuGet.targets = .nuget\NuGet.targets
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShareX_Setup", "ShareX_Setup\ShareX_Setup.csproj", "{3D19A94A-7A58-4451-A686-EE70B471C206}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShareX.Setup", "ShareX.Setup\ShareX.Setup.csproj", "{3D19A94A-7A58-4451-A686-EE70B471C206}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/ShareX/Program.cs b/ShareX/Program.cs
index ab79a1d74..db1fbd2c6 100644
--- a/ShareX/Program.cs
+++ b/ShareX/Program.cs
@@ -39,7 +39,7 @@ namespace ShareX
 {
     internal static class Program
     {
-        public static bool IsBeta = false;
+        public static bool IsBeta = true;
 
         public static string Title
         {
diff --git a/ShareX/Properties/AssemblyInfo.cs b/ShareX/Properties/AssemblyInfo.cs
index 3807c2468..2aa8f677f 100644
--- a/ShareX/Properties/AssemblyInfo.cs
+++ b/ShareX/Properties/AssemblyInfo.cs
@@ -11,5 +11,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("82E6AC09-0FEF-4390-AD9F-0DD3F5561EFC")]
-[assembly: AssemblyVersion("9.4.2")]
-[assembly: AssemblyFileVersion("9.4.2")]
\ No newline at end of file
+[assembly: AssemblyVersion("9.5.0")]
+[assembly: AssemblyFileVersion("9.5.0")]
\ No newline at end of file
diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj
index aac107fb6..a01828563 100644
--- a/ShareX/ShareX.csproj
+++ b/ShareX/ShareX.csproj
@@ -358,29 +358,29 @@
     <EmbeddedResource Include="Properties\Resources.tr.resx" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\HistoryLib\HistoryLib.csproj">
+    <ProjectReference Include="..\ShareX.HistoryLib\ShareX.HistoryLib.csproj">
       <Project>{E7DE6237-AEA2-498B-8F56-9B392472C490}</Project>
-      <Name>HistoryLib</Name>
+      <Name>ShareX.HistoryLib</Name>
     </ProjectReference>
-    <ProjectReference Include="..\ImageEffectsLib\ImageEffectsLib.csproj">
+    <ProjectReference Include="..\ShareX.ImageEffectsLib\ShareX.ImageEffectsLib.csproj">
       <Project>{d13441b6-96e1-4d1b-8a95-58a7d6cb1e24}</Project>
-      <Name>ImageEffectsLib</Name>
+      <Name>ShareX.ImageEffectsLib</Name>
     </ProjectReference>
-    <ProjectReference Include="..\IndexerLib\IndexerLib.csproj">
+    <ProjectReference Include="..\ShareX.IndexerLib\ShareX.IndexerLib.csproj">
       <Project>{750c6f46-2c5a-4488-81d3-3b35ca50f3ee}</Project>
-      <Name>IndexerLib</Name>
+      <Name>ShareX.IndexerLib</Name>
     </ProjectReference>
-    <ProjectReference Include="..\ScreenCaptureLib\ScreenCaptureLib.csproj">
+    <ProjectReference Include="..\ShareX.ScreenCaptureLib\ShareX.ScreenCaptureLib.csproj">
       <Project>{DBDB0DAA-B3AE-4CC4-A8C2-20550B7F32E3}</Project>
-      <Name>ScreenCaptureLib</Name>
+      <Name>ShareX.ScreenCaptureLib</Name>
     </ProjectReference>
-    <ProjectReference Include="..\HelpersLib\HelpersLib.csproj">
+    <ProjectReference Include="..\ShareX.HelpersLib\ShareX.HelpersLib.csproj">
       <Project>{327750E1-9FB7-4CC3-8AEA-9BC42180CAD3}</Project>
-      <Name>HelpersLib</Name>
+      <Name>ShareX.HelpersLib</Name>
     </ProjectReference>
-    <ProjectReference Include="..\UploadersLib\UploadersLib.csproj">
+    <ProjectReference Include="..\ShareX.UploadersLib\ShareX.UploadersLib.csproj">
       <Project>{E1C94415-3424-4517-A2A1-B2FDD1F59C67}</Project>
-      <Name>UploadersLib</Name>
+      <Name>ShareX.UploadersLib</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UploadersLib/APIKeys/jira_sharex.pfx b/UploadersLib/APIKeys/jira_sharex.pfx
deleted file mode 100644
index 61f0c57c6..000000000
Binary files a/UploadersLib/APIKeys/jira_sharex.pfx and /dev/null differ
diff --git a/UploadersLib/Properties/AssemblyInfo.cs b/UploadersLib/Properties/AssemblyInfo.cs
deleted file mode 100644
index d98b95972..000000000
--- a/UploadersLib/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("UploadersLib")]
-[assembly: AssemblyDescription("Dynamic Link Library for image/text/file hosting services")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("ShareX Developers")]
-[assembly: AssemblyProduct("UploadersLib")]
-[assembly: AssemblyCopyright("Copyright (C) 2007-2014 ShareX Developers")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-[assembly: Guid("61f63572-6737-4a35-bcde-d2a53861e296")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file