diff --git a/source/net/sourceforge/filebot/Analytics.java b/source/net/filebot/Analytics.java
similarity index 100%
rename from source/net/sourceforge/filebot/Analytics.java
rename to source/net/filebot/Analytics.java
diff --git a/source/net/sourceforge/filebot/Cache.java b/source/net/filebot/Cache.java
similarity index 100%
rename from source/net/sourceforge/filebot/Cache.java
rename to source/net/filebot/Cache.java
diff --git a/source/net/sourceforge/filebot/History.java b/source/net/filebot/History.java
similarity index 100%
rename from source/net/sourceforge/filebot/History.java
rename to source/net/filebot/History.java
diff --git a/source/net/sourceforge/filebot/HistorySpooler.java b/source/net/filebot/HistorySpooler.java
similarity index 100%
rename from source/net/sourceforge/filebot/HistorySpooler.java
rename to source/net/filebot/HistorySpooler.java
diff --git a/source/net/sourceforge/filebot/Language.java b/source/net/filebot/Language.java
similarity index 100%
rename from source/net/sourceforge/filebot/Language.java
rename to source/net/filebot/Language.java
diff --git a/source/net/sourceforge/filebot/Language.properties b/source/net/filebot/Language.properties
similarity index 100%
rename from source/net/sourceforge/filebot/Language.properties
rename to source/net/filebot/Language.properties
diff --git a/source/net/sourceforge/filebot/Main.java b/source/net/filebot/Main.java
similarity index 100%
rename from source/net/sourceforge/filebot/Main.java
rename to source/net/filebot/Main.java
diff --git a/source/net/sourceforge/filebot/MediaTypes.java b/source/net/filebot/MediaTypes.java
similarity index 100%
rename from source/net/sourceforge/filebot/MediaTypes.java
rename to source/net/filebot/MediaTypes.java
diff --git a/source/net/sourceforge/filebot/MetaAttributeView.java b/source/net/filebot/MetaAttributeView.java
similarity index 100%
rename from source/net/sourceforge/filebot/MetaAttributeView.java
rename to source/net/filebot/MetaAttributeView.java
diff --git a/source/net/sourceforge/filebot/NativeRenameAction.java b/source/net/filebot/NativeRenameAction.java
similarity index 100%
rename from source/net/sourceforge/filebot/NativeRenameAction.java
rename to source/net/filebot/NativeRenameAction.java
diff --git a/source/net/sourceforge/filebot/RenameAction.java b/source/net/filebot/RenameAction.java
similarity index 100%
rename from source/net/sourceforge/filebot/RenameAction.java
rename to source/net/filebot/RenameAction.java
diff --git a/source/net/sourceforge/filebot/ResourceManager.java b/source/net/filebot/ResourceManager.java
similarity index 100%
rename from source/net/sourceforge/filebot/ResourceManager.java
rename to source/net/filebot/ResourceManager.java
diff --git a/source/net/sourceforge/filebot/Settings.java b/source/net/filebot/Settings.java
similarity index 100%
rename from source/net/sourceforge/filebot/Settings.java
rename to source/net/filebot/Settings.java
diff --git a/source/net/sourceforge/filebot/Settings.properties b/source/net/filebot/Settings.properties
similarity index 100%
rename from source/net/sourceforge/filebot/Settings.properties
rename to source/net/filebot/Settings.properties
diff --git a/source/net/sourceforge/filebot/StandardRenameAction.java b/source/net/filebot/StandardRenameAction.java
similarity index 100%
rename from source/net/sourceforge/filebot/StandardRenameAction.java
rename to source/net/filebot/StandardRenameAction.java
diff --git a/source/net/sourceforge/filebot/WebServices.java b/source/net/filebot/WebServices.java
similarity index 100%
rename from source/net/sourceforge/filebot/WebServices.java
rename to source/net/filebot/WebServices.java
diff --git a/source/net/sourceforge/filebot/archive/Archive.java b/source/net/filebot/archive/Archive.java
similarity index 100%
rename from source/net/sourceforge/filebot/archive/Archive.java
rename to source/net/filebot/archive/Archive.java
diff --git a/source/net/sourceforge/filebot/archive/ArchiveOpenVolumeCallback.java b/source/net/filebot/archive/ArchiveOpenVolumeCallback.java
similarity index 100%
rename from source/net/sourceforge/filebot/archive/ArchiveOpenVolumeCallback.java
rename to source/net/filebot/archive/ArchiveOpenVolumeCallback.java
diff --git a/source/net/sourceforge/filebot/archive/ExtractCallback.java b/source/net/filebot/archive/ExtractCallback.java
similarity index 100%
rename from source/net/sourceforge/filebot/archive/ExtractCallback.java
rename to source/net/filebot/archive/ExtractCallback.java
diff --git a/source/net/sourceforge/filebot/archive/ExtractOutProvider.java b/source/net/filebot/archive/ExtractOutProvider.java
similarity index 100%
rename from source/net/sourceforge/filebot/archive/ExtractOutProvider.java
rename to source/net/filebot/archive/ExtractOutProvider.java
diff --git a/source/net/sourceforge/filebot/archive/ExtractOutStream.java b/source/net/filebot/archive/ExtractOutStream.java
similarity index 100%
rename from source/net/sourceforge/filebot/archive/ExtractOutStream.java
rename to source/net/filebot/archive/ExtractOutStream.java
diff --git a/source/net/sourceforge/filebot/archive/FileMapper.java b/source/net/filebot/archive/FileMapper.java
similarity index 100%
rename from source/net/sourceforge/filebot/archive/FileMapper.java
rename to source/net/filebot/archive/FileMapper.java
diff --git a/source/net/sourceforge/filebot/archive/SevenZipLoader.java b/source/net/filebot/archive/SevenZipLoader.java
similarity index 100%
rename from source/net/sourceforge/filebot/archive/SevenZipLoader.java
rename to source/net/filebot/archive/SevenZipLoader.java
diff --git a/source/net/sourceforge/filebot/archive/VolumedArchiveInStream.java b/source/net/filebot/archive/VolumedArchiveInStream.java
similarity index 100%
rename from source/net/sourceforge/filebot/archive/VolumedArchiveInStream.java
rename to source/net/filebot/archive/VolumedArchiveInStream.java
diff --git a/source/net/sourceforge/filebot/cli/ArgumentBean.java b/source/net/filebot/cli/ArgumentBean.java
similarity index 100%
rename from source/net/sourceforge/filebot/cli/ArgumentBean.java
rename to source/net/filebot/cli/ArgumentBean.java
diff --git a/source/net/sourceforge/filebot/cli/ArgumentProcessor.java b/source/net/filebot/cli/ArgumentProcessor.java
similarity index 100%
rename from source/net/sourceforge/filebot/cli/ArgumentProcessor.java
rename to source/net/filebot/cli/ArgumentProcessor.java
diff --git a/source/net/sourceforge/filebot/cli/BindingsHandler.java b/source/net/filebot/cli/BindingsHandler.java
similarity index 100%
rename from source/net/sourceforge/filebot/cli/BindingsHandler.java
rename to source/net/filebot/cli/BindingsHandler.java
diff --git a/source/net/sourceforge/filebot/cli/CLILogging.java b/source/net/filebot/cli/CLILogging.java
similarity index 100%
rename from source/net/sourceforge/filebot/cli/CLILogging.java
rename to source/net/filebot/cli/CLILogging.java
diff --git a/source/net/sourceforge/filebot/cli/CmdlineInterface.java b/source/net/filebot/cli/CmdlineInterface.java
similarity index 100%
rename from source/net/sourceforge/filebot/cli/CmdlineInterface.java
rename to source/net/filebot/cli/CmdlineInterface.java
diff --git a/source/net/sourceforge/filebot/cli/CmdlineOperations.java b/source/net/filebot/cli/CmdlineOperations.java
similarity index 100%
rename from source/net/sourceforge/filebot/cli/CmdlineOperations.java
rename to source/net/filebot/cli/CmdlineOperations.java
diff --git a/source/net/sourceforge/filebot/cli/ConflictAction.java b/source/net/filebot/cli/ConflictAction.java
similarity index 100%
rename from source/net/sourceforge/filebot/cli/ConflictAction.java
rename to source/net/filebot/cli/ConflictAction.java
diff --git a/source/net/sourceforge/filebot/cli/FolderWatchService.java b/source/net/filebot/cli/FolderWatchService.java
similarity index 100%
rename from source/net/sourceforge/filebot/cli/FolderWatchService.java
rename to source/net/filebot/cli/FolderWatchService.java
diff --git a/source/net/sourceforge/filebot/cli/GroovyPad.java b/source/net/filebot/cli/GroovyPad.java
similarity index 100%
rename from source/net/sourceforge/filebot/cli/GroovyPad.java
rename to source/net/filebot/cli/GroovyPad.java
diff --git a/source/net/sourceforge/filebot/cli/ScriptShell.java b/source/net/filebot/cli/ScriptShell.java
similarity index 100%
rename from source/net/sourceforge/filebot/cli/ScriptShell.java
rename to source/net/filebot/cli/ScriptShell.java
diff --git a/source/net/sourceforge/filebot/cli/ScriptShell.properties b/source/net/filebot/cli/ScriptShell.properties
similarity index 100%
rename from source/net/sourceforge/filebot/cli/ScriptShell.properties
rename to source/net/filebot/cli/ScriptShell.properties
diff --git a/source/net/sourceforge/filebot/cli/ScriptShellBaseClass.java b/source/net/filebot/cli/ScriptShellBaseClass.java
similarity index 100%
rename from source/net/sourceforge/filebot/cli/ScriptShellBaseClass.java
rename to source/net/filebot/cli/ScriptShellBaseClass.java
diff --git a/source/net/sourceforge/filebot/cli/ScriptShellMethods.java b/source/net/filebot/cli/ScriptShellMethods.java
similarity index 100%
rename from source/net/sourceforge/filebot/cli/ScriptShellMethods.java
rename to source/net/filebot/cli/ScriptShellMethods.java
diff --git a/source/net/sourceforge/filebot/format/AssociativeScriptObject.java b/source/net/filebot/format/AssociativeScriptObject.java
similarity index 100%
rename from source/net/sourceforge/filebot/format/AssociativeScriptObject.java
rename to source/net/filebot/format/AssociativeScriptObject.java
diff --git a/source/net/sourceforge/filebot/format/BindingException.java b/source/net/filebot/format/BindingException.java
similarity index 100%
rename from source/net/sourceforge/filebot/format/BindingException.java
rename to source/net/filebot/format/BindingException.java
diff --git a/source/net/sourceforge/filebot/format/Define.java b/source/net/filebot/format/Define.java
similarity index 100%
rename from source/net/sourceforge/filebot/format/Define.java
rename to source/net/filebot/format/Define.java
diff --git a/source/net/sourceforge/filebot/format/ExpressionBindings.java b/source/net/filebot/format/ExpressionBindings.java
similarity index 100%
rename from source/net/sourceforge/filebot/format/ExpressionBindings.java
rename to source/net/filebot/format/ExpressionBindings.java
diff --git a/source/net/sourceforge/filebot/format/ExpressionException.java b/source/net/filebot/format/ExpressionException.java
similarity index 100%
rename from source/net/sourceforge/filebot/format/ExpressionException.java
rename to source/net/filebot/format/ExpressionException.java
diff --git a/source/net/sourceforge/filebot/format/ExpressionFilter.java b/source/net/filebot/format/ExpressionFilter.java
similarity index 100%
rename from source/net/sourceforge/filebot/format/ExpressionFilter.java
rename to source/net/filebot/format/ExpressionFilter.java
diff --git a/source/net/sourceforge/filebot/format/ExpressionFormat.java b/source/net/filebot/format/ExpressionFormat.java
similarity index 100%
rename from source/net/sourceforge/filebot/format/ExpressionFormat.java
rename to source/net/filebot/format/ExpressionFormat.java
diff --git a/source/net/sourceforge/filebot/format/ExpressionFormatFunctions.java b/source/net/filebot/format/ExpressionFormatFunctions.java
similarity index 100%
rename from source/net/sourceforge/filebot/format/ExpressionFormatFunctions.java
rename to source/net/filebot/format/ExpressionFormatFunctions.java
diff --git a/source/net/sourceforge/filebot/format/ExpressionFormatMethods.java b/source/net/filebot/format/ExpressionFormatMethods.java
similarity index 100%
rename from source/net/sourceforge/filebot/format/ExpressionFormatMethods.java
rename to source/net/filebot/format/ExpressionFormatMethods.java
diff --git a/source/net/sourceforge/filebot/format/MediaBindingBean.java b/source/net/filebot/format/MediaBindingBean.java
similarity index 100%
rename from source/net/sourceforge/filebot/format/MediaBindingBean.java
rename to source/net/filebot/format/MediaBindingBean.java
diff --git a/source/net/sourceforge/filebot/format/PrivilegedInvocation.java b/source/net/filebot/format/PrivilegedInvocation.java
similarity index 100%
rename from source/net/sourceforge/filebot/format/PrivilegedInvocation.java
rename to source/net/filebot/format/PrivilegedInvocation.java
diff --git a/source/net/sourceforge/filebot/format/PropertyBindings.java b/source/net/filebot/format/PropertyBindings.java
similarity index 100%
rename from source/net/sourceforge/filebot/format/PropertyBindings.java
rename to source/net/filebot/format/PropertyBindings.java
diff --git a/source/net/sourceforge/filebot/format/SecureCompiledScript.java b/source/net/filebot/format/SecureCompiledScript.java
similarity index 100%
rename from source/net/sourceforge/filebot/format/SecureCompiledScript.java
rename to source/net/filebot/format/SecureCompiledScript.java
diff --git a/source/net/sourceforge/filebot/gio/GIOLibrary.java b/source/net/filebot/gio/GIOLibrary.java
similarity index 100%
rename from source/net/sourceforge/filebot/gio/GIOLibrary.java
rename to source/net/filebot/gio/GIOLibrary.java
diff --git a/source/net/sourceforge/filebot/gio/GVFS.java b/source/net/filebot/gio/GVFS.java
similarity index 100%
rename from source/net/sourceforge/filebot/gio/GVFS.java
rename to source/net/filebot/gio/GVFS.java
diff --git a/source/net/sourceforge/filebot/hash/ChecksumHash.java b/source/net/filebot/hash/ChecksumHash.java
similarity index 100%
rename from source/net/sourceforge/filebot/hash/ChecksumHash.java
rename to source/net/filebot/hash/ChecksumHash.java
diff --git a/source/net/sourceforge/filebot/hash/Ed2kHash.java b/source/net/filebot/hash/Ed2kHash.java
similarity index 100%
rename from source/net/sourceforge/filebot/hash/Ed2kHash.java
rename to source/net/filebot/hash/Ed2kHash.java
diff --git a/source/net/sourceforge/filebot/hash/Hash.java b/source/net/filebot/hash/Hash.java
similarity index 100%
rename from source/net/sourceforge/filebot/hash/Hash.java
rename to source/net/filebot/hash/Hash.java
diff --git a/source/net/sourceforge/filebot/hash/HashType.java b/source/net/filebot/hash/HashType.java
similarity index 100%
rename from source/net/sourceforge/filebot/hash/HashType.java
rename to source/net/filebot/hash/HashType.java
diff --git a/source/net/sourceforge/filebot/hash/MessageDigestHash.java b/source/net/filebot/hash/MessageDigestHash.java
similarity index 100%
rename from source/net/sourceforge/filebot/hash/MessageDigestHash.java
rename to source/net/filebot/hash/MessageDigestHash.java
diff --git a/source/net/sourceforge/filebot/hash/SfvFormat.java b/source/net/filebot/hash/SfvFormat.java
similarity index 100%
rename from source/net/sourceforge/filebot/hash/SfvFormat.java
rename to source/net/filebot/hash/SfvFormat.java
diff --git a/source/net/sourceforge/filebot/hash/VerificationFileReader.java b/source/net/filebot/hash/VerificationFileReader.java
similarity index 100%
rename from source/net/sourceforge/filebot/hash/VerificationFileReader.java
rename to source/net/filebot/hash/VerificationFileReader.java
diff --git a/source/net/sourceforge/filebot/hash/VerificationFileWriter.java b/source/net/filebot/hash/VerificationFileWriter.java
similarity index 100%
rename from source/net/sourceforge/filebot/hash/VerificationFileWriter.java
rename to source/net/filebot/hash/VerificationFileWriter.java
diff --git a/source/net/sourceforge/filebot/hash/VerificationFormat.java b/source/net/filebot/hash/VerificationFormat.java
similarity index 100%
rename from source/net/sourceforge/filebot/hash/VerificationFormat.java
rename to source/net/filebot/hash/VerificationFormat.java
diff --git a/source/net/sourceforge/filebot/hash/VerificationUtilities.java b/source/net/filebot/hash/VerificationUtilities.java
similarity index 100%
rename from source/net/sourceforge/filebot/hash/VerificationUtilities.java
rename to source/net/filebot/hash/VerificationUtilities.java
diff --git a/source/net/sourceforge/filebot/media.types b/source/net/filebot/media.types
similarity index 100%
rename from source/net/sourceforge/filebot/media.types
rename to source/net/filebot/media.types
diff --git a/source/net/sourceforge/filebot/media/MediaDetection.java b/source/net/filebot/media/MediaDetection.java
similarity index 100%
rename from source/net/sourceforge/filebot/media/MediaDetection.java
rename to source/net/filebot/media/MediaDetection.java
diff --git a/source/net/sourceforge/filebot/media/MetaAttributes.java b/source/net/filebot/media/MetaAttributes.java
similarity index 100%
rename from source/net/sourceforge/filebot/media/MetaAttributes.java
rename to source/net/filebot/media/MetaAttributes.java
diff --git a/source/net/sourceforge/filebot/media/ReleaseInfo.java b/source/net/filebot/media/ReleaseInfo.java
similarity index 100%
rename from source/net/sourceforge/filebot/media/ReleaseInfo.java
rename to source/net/filebot/media/ReleaseInfo.java
diff --git a/source/net/sourceforge/filebot/media/ReleaseInfo.properties b/source/net/filebot/media/ReleaseInfo.properties
similarity index 100%
rename from source/net/sourceforge/filebot/media/ReleaseInfo.properties
rename to source/net/filebot/media/ReleaseInfo.properties
diff --git a/source/net/sourceforge/filebot/media/SmartSeasonEpisodeMatcher.java b/source/net/filebot/media/SmartSeasonEpisodeMatcher.java
similarity index 100%
rename from source/net/sourceforge/filebot/media/SmartSeasonEpisodeMatcher.java
rename to source/net/filebot/media/SmartSeasonEpisodeMatcher.java
diff --git a/source/net/sourceforge/filebot/mediainfo/MediaDurationFilter.java b/source/net/filebot/mediainfo/MediaDurationFilter.java
similarity index 100%
rename from source/net/sourceforge/filebot/mediainfo/MediaDurationFilter.java
rename to source/net/filebot/mediainfo/MediaDurationFilter.java
diff --git a/source/net/sourceforge/filebot/mediainfo/MediaInfo.java b/source/net/filebot/mediainfo/MediaInfo.java
similarity index 100%
rename from source/net/sourceforge/filebot/mediainfo/MediaInfo.java
rename to source/net/filebot/mediainfo/MediaInfo.java
diff --git a/source/net/sourceforge/filebot/mediainfo/MediaInfoException.java b/source/net/filebot/mediainfo/MediaInfoException.java
similarity index 100%
rename from source/net/sourceforge/filebot/mediainfo/MediaInfoException.java
rename to source/net/filebot/mediainfo/MediaInfoException.java
diff --git a/source/net/sourceforge/filebot/mediainfo/MediaInfoLibrary.java b/source/net/filebot/mediainfo/MediaInfoLibrary.java
similarity index 100%
rename from source/net/sourceforge/filebot/mediainfo/MediaInfoLibrary.java
rename to source/net/filebot/mediainfo/MediaInfoLibrary.java
diff --git a/source/net/sourceforge/filebot/resources/action.clear.png b/source/net/filebot/resources/action.clear.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.clear.png
rename to source/net/filebot/resources/action.clear.png
diff --git a/source/net/sourceforge/filebot/resources/action.down.png b/source/net/filebot/resources/action.down.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.down.png
rename to source/net/filebot/resources/action.down.png
diff --git a/source/net/sourceforge/filebot/resources/action.expand.png b/source/net/filebot/resources/action.expand.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.expand.png
rename to source/net/filebot/resources/action.expand.png
diff --git a/source/net/sourceforge/filebot/resources/action.export.png b/source/net/filebot/resources/action.export.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.export.png
rename to source/net/filebot/resources/action.export.png
diff --git a/source/net/sourceforge/filebot/resources/action.extension.override.png b/source/net/filebot/resources/action.extension.override.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.extension.override.png
rename to source/net/filebot/resources/action.extension.override.png
diff --git a/source/net/sourceforge/filebot/resources/action.extension.preserve.png b/source/net/filebot/resources/action.extension.preserve.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.extension.preserve.png
rename to source/net/filebot/resources/action.extension.preserve.png
diff --git a/source/net/sourceforge/filebot/resources/action.fetch.png b/source/net/filebot/resources/action.fetch.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.fetch.png
rename to source/net/filebot/resources/action.fetch.png
diff --git a/source/net/sourceforge/filebot/resources/action.find.png b/source/net/filebot/resources/action.find.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.find.png
rename to source/net/filebot/resources/action.find.png
diff --git a/source/net/sourceforge/filebot/resources/action.format.png b/source/net/filebot/resources/action.format.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.format.png
rename to source/net/filebot/resources/action.format.png
diff --git a/source/net/sourceforge/filebot/resources/action.list.png b/source/net/filebot/resources/action.list.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.list.png
rename to source/net/filebot/resources/action.list.png
diff --git a/source/net/sourceforge/filebot/resources/action.load.png b/source/net/filebot/resources/action.load.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.load.png
rename to source/net/filebot/resources/action.load.png
diff --git a/source/net/sourceforge/filebot/resources/action.match.png b/source/net/filebot/resources/action.match.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.match.png
rename to source/net/filebot/resources/action.match.png
diff --git a/source/net/sourceforge/filebot/resources/action.match.small.png b/source/net/filebot/resources/action.match.small.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.match.small.png
rename to source/net/filebot/resources/action.match.small.png
diff --git a/source/net/sourceforge/filebot/resources/action.preferences.png b/source/net/filebot/resources/action.preferences.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.preferences.png
rename to source/net/filebot/resources/action.preferences.png
diff --git a/source/net/sourceforge/filebot/resources/action.properties.png b/source/net/filebot/resources/action.properties.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.properties.png
rename to source/net/filebot/resources/action.properties.png
diff --git a/source/net/sourceforge/filebot/resources/action.rename.png b/source/net/filebot/resources/action.rename.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.rename.png
rename to source/net/filebot/resources/action.rename.png
diff --git a/source/net/sourceforge/filebot/resources/action.report.png b/source/net/filebot/resources/action.report.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.report.png
rename to source/net/filebot/resources/action.report.png
diff --git a/source/net/sourceforge/filebot/resources/action.revert.png b/source/net/filebot/resources/action.revert.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.revert.png
rename to source/net/filebot/resources/action.revert.png
diff --git a/source/net/sourceforge/filebot/resources/action.save.png b/source/net/filebot/resources/action.save.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.save.png
rename to source/net/filebot/resources/action.save.png
diff --git a/source/net/sourceforge/filebot/resources/action.settings.png b/source/net/filebot/resources/action.settings.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.settings.png
rename to source/net/filebot/resources/action.settings.png
diff --git a/source/net/sourceforge/filebot/resources/action.up.png b/source/net/filebot/resources/action.up.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.up.png
rename to source/net/filebot/resources/action.up.png
diff --git a/source/net/sourceforge/filebot/resources/action.user.png b/source/net/filebot/resources/action.user.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.user.png
rename to source/net/filebot/resources/action.user.png
diff --git a/source/net/sourceforge/filebot/resources/action.variable.png b/source/net/filebot/resources/action.variable.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/action.variable.png
rename to source/net/filebot/resources/action.variable.png
diff --git a/source/net/sourceforge/filebot/resources/arrow.down.png b/source/net/filebot/resources/arrow.down.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/arrow.down.png
rename to source/net/filebot/resources/arrow.down.png
diff --git a/source/net/sourceforge/filebot/resources/bullet.green.png b/source/net/filebot/resources/bullet.green.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/bullet.green.png
rename to source/net/filebot/resources/bullet.green.png
diff --git a/source/net/sourceforge/filebot/resources/bullet.yellow.png b/source/net/filebot/resources/bullet.yellow.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/bullet.yellow.png
rename to source/net/filebot/resources/bullet.yellow.png
diff --git a/source/net/sourceforge/filebot/resources/button.checksum.png b/source/net/filebot/resources/button.checksum.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/button.checksum.png
rename to source/net/filebot/resources/button.checksum.png
diff --git a/source/net/sourceforge/filebot/resources/button.checksum.selected.png b/source/net/filebot/resources/button.checksum.selected.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/button.checksum.selected.png
rename to source/net/filebot/resources/button.checksum.selected.png
diff --git a/source/net/sourceforge/filebot/resources/button.repeat.png b/source/net/filebot/resources/button.repeat.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/button.repeat.png
rename to source/net/filebot/resources/button.repeat.png
diff --git a/source/net/sourceforge/filebot/resources/button.repeat.selected.png b/source/net/filebot/resources/button.repeat.selected.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/button.repeat.selected.png
rename to source/net/filebot/resources/button.repeat.selected.png
diff --git a/source/net/sourceforge/filebot/resources/database.error.png b/source/net/filebot/resources/database.error.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/database.error.png
rename to source/net/filebot/resources/database.error.png
diff --git a/source/net/sourceforge/filebot/resources/database.go.png b/source/net/filebot/resources/database.go.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/database.go.png
rename to source/net/filebot/resources/database.go.png
diff --git a/source/net/sourceforge/filebot/resources/database.ok.png b/source/net/filebot/resources/database.ok.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/database.ok.png
rename to source/net/filebot/resources/database.ok.png
diff --git a/source/net/sourceforge/filebot/resources/decoration.header.png b/source/net/filebot/resources/decoration.header.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/decoration.header.png
rename to source/net/filebot/resources/decoration.header.png
diff --git a/source/net/sourceforge/filebot/resources/dialog.cancel.png b/source/net/filebot/resources/dialog.cancel.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/dialog.cancel.png
rename to source/net/filebot/resources/dialog.cancel.png
diff --git a/source/net/sourceforge/filebot/resources/dialog.continue.invalid.png b/source/net/filebot/resources/dialog.continue.invalid.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/dialog.continue.invalid.png
rename to source/net/filebot/resources/dialog.continue.invalid.png
diff --git a/source/net/sourceforge/filebot/resources/dialog.continue.png b/source/net/filebot/resources/dialog.continue.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/dialog.continue.png
rename to source/net/filebot/resources/dialog.continue.png
diff --git a/source/net/sourceforge/filebot/resources/dialog.switch.png b/source/net/filebot/resources/dialog.switch.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/dialog.switch.png
rename to source/net/filebot/resources/dialog.switch.png
diff --git a/source/net/sourceforge/filebot/resources/edit.clear.png b/source/net/filebot/resources/edit.clear.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/edit.clear.png
rename to source/net/filebot/resources/edit.clear.png
diff --git a/source/net/sourceforge/filebot/resources/file.subtitle.png b/source/net/filebot/resources/file.subtitle.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/file.subtitle.png
rename to source/net/filebot/resources/file.subtitle.png
diff --git a/source/net/sourceforge/filebot/resources/file.unknown.png b/source/net/filebot/resources/file.unknown.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/file.unknown.png
rename to source/net/filebot/resources/file.unknown.png
diff --git a/source/net/sourceforge/filebot/resources/file.video.png b/source/net/filebot/resources/file.video.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/file.video.png
rename to source/net/filebot/resources/file.video.png
diff --git a/source/net/sourceforge/filebot/resources/flags/ar.png b/source/net/filebot/resources/flags/ar.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/ar.png
rename to source/net/filebot/resources/flags/ar.png
diff --git a/source/net/sourceforge/filebot/resources/flags/bg.png b/source/net/filebot/resources/flags/bg.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/bg.png
rename to source/net/filebot/resources/flags/bg.png
diff --git a/source/net/sourceforge/filebot/resources/flags/ca.png b/source/net/filebot/resources/flags/ca.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/ca.png
rename to source/net/filebot/resources/flags/ca.png
diff --git a/source/net/sourceforge/filebot/resources/flags/cs.png b/source/net/filebot/resources/flags/cs.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/cs.png
rename to source/net/filebot/resources/flags/cs.png
diff --git a/source/net/sourceforge/filebot/resources/flags/da.png b/source/net/filebot/resources/flags/da.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/da.png
rename to source/net/filebot/resources/flags/da.png
diff --git a/source/net/sourceforge/filebot/resources/flags/de.png b/source/net/filebot/resources/flags/de.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/de.png
rename to source/net/filebot/resources/flags/de.png
diff --git a/source/net/sourceforge/filebot/resources/flags/default.png b/source/net/filebot/resources/flags/default.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/default.png
rename to source/net/filebot/resources/flags/default.png
diff --git a/source/net/sourceforge/filebot/resources/flags/el.png b/source/net/filebot/resources/flags/el.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/el.png
rename to source/net/filebot/resources/flags/el.png
diff --git a/source/net/sourceforge/filebot/resources/flags/en.png b/source/net/filebot/resources/flags/en.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/en.png
rename to source/net/filebot/resources/flags/en.png
diff --git a/source/net/sourceforge/filebot/resources/flags/es.png b/source/net/filebot/resources/flags/es.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/es.png
rename to source/net/filebot/resources/flags/es.png
diff --git a/source/net/sourceforge/filebot/resources/flags/et.png b/source/net/filebot/resources/flags/et.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/et.png
rename to source/net/filebot/resources/flags/et.png
diff --git a/source/net/sourceforge/filebot/resources/flags/fa.png b/source/net/filebot/resources/flags/fa.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/fa.png
rename to source/net/filebot/resources/flags/fa.png
diff --git a/source/net/sourceforge/filebot/resources/flags/fi.png b/source/net/filebot/resources/flags/fi.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/fi.png
rename to source/net/filebot/resources/flags/fi.png
diff --git a/source/net/sourceforge/filebot/resources/flags/fr.png b/source/net/filebot/resources/flags/fr.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/fr.png
rename to source/net/filebot/resources/flags/fr.png
diff --git a/source/net/sourceforge/filebot/resources/flags/he.png b/source/net/filebot/resources/flags/he.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/he.png
rename to source/net/filebot/resources/flags/he.png
diff --git a/source/net/sourceforge/filebot/resources/flags/hi.png b/source/net/filebot/resources/flags/hi.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/hi.png
rename to source/net/filebot/resources/flags/hi.png
diff --git a/source/net/sourceforge/filebot/resources/flags/hr.png b/source/net/filebot/resources/flags/hr.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/hr.png
rename to source/net/filebot/resources/flags/hr.png
diff --git a/source/net/sourceforge/filebot/resources/flags/hu.png b/source/net/filebot/resources/flags/hu.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/hu.png
rename to source/net/filebot/resources/flags/hu.png
diff --git a/source/net/sourceforge/filebot/resources/flags/hy.png b/source/net/filebot/resources/flags/hy.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/hy.png
rename to source/net/filebot/resources/flags/hy.png
diff --git a/source/net/sourceforge/filebot/resources/flags/id.png b/source/net/filebot/resources/flags/id.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/id.png
rename to source/net/filebot/resources/flags/id.png
diff --git a/source/net/sourceforge/filebot/resources/flags/it.png b/source/net/filebot/resources/flags/it.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/it.png
rename to source/net/filebot/resources/flags/it.png
diff --git a/source/net/sourceforge/filebot/resources/flags/ja.png b/source/net/filebot/resources/flags/ja.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/ja.png
rename to source/net/filebot/resources/flags/ja.png
diff --git a/source/net/sourceforge/filebot/resources/flags/ko.png b/source/net/filebot/resources/flags/ko.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/ko.png
rename to source/net/filebot/resources/flags/ko.png
diff --git a/source/net/sourceforge/filebot/resources/flags/lt.png b/source/net/filebot/resources/flags/lt.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/lt.png
rename to source/net/filebot/resources/flags/lt.png
diff --git a/source/net/sourceforge/filebot/resources/flags/lv.png b/source/net/filebot/resources/flags/lv.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/lv.png
rename to source/net/filebot/resources/flags/lv.png
diff --git a/source/net/sourceforge/filebot/resources/flags/mk.png b/source/net/filebot/resources/flags/mk.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/mk.png
rename to source/net/filebot/resources/flags/mk.png
diff --git a/source/net/sourceforge/filebot/resources/flags/ms.png b/source/net/filebot/resources/flags/ms.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/ms.png
rename to source/net/filebot/resources/flags/ms.png
diff --git a/source/net/sourceforge/filebot/resources/flags/nl.png b/source/net/filebot/resources/flags/nl.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/nl.png
rename to source/net/filebot/resources/flags/nl.png
diff --git a/source/net/sourceforge/filebot/resources/flags/no.png b/source/net/filebot/resources/flags/no.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/no.png
rename to source/net/filebot/resources/flags/no.png
diff --git a/source/net/sourceforge/filebot/resources/flags/pb.png b/source/net/filebot/resources/flags/pb.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/pb.png
rename to source/net/filebot/resources/flags/pb.png
diff --git a/source/net/sourceforge/filebot/resources/flags/pl.png b/source/net/filebot/resources/flags/pl.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/pl.png
rename to source/net/filebot/resources/flags/pl.png
diff --git a/source/net/sourceforge/filebot/resources/flags/pt.png b/source/net/filebot/resources/flags/pt.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/pt.png
rename to source/net/filebot/resources/flags/pt.png
diff --git a/source/net/sourceforge/filebot/resources/flags/ro.png b/source/net/filebot/resources/flags/ro.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/ro.png
rename to source/net/filebot/resources/flags/ro.png
diff --git a/source/net/sourceforge/filebot/resources/flags/ru.png b/source/net/filebot/resources/flags/ru.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/ru.png
rename to source/net/filebot/resources/flags/ru.png
diff --git a/source/net/sourceforge/filebot/resources/flags/sk.png b/source/net/filebot/resources/flags/sk.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/sk.png
rename to source/net/filebot/resources/flags/sk.png
diff --git a/source/net/sourceforge/filebot/resources/flags/sl.png b/source/net/filebot/resources/flags/sl.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/sl.png
rename to source/net/filebot/resources/flags/sl.png
diff --git a/source/net/sourceforge/filebot/resources/flags/sq.png b/source/net/filebot/resources/flags/sq.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/sq.png
rename to source/net/filebot/resources/flags/sq.png
diff --git a/source/net/sourceforge/filebot/resources/flags/sr.png b/source/net/filebot/resources/flags/sr.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/sr.png
rename to source/net/filebot/resources/flags/sr.png
diff --git a/source/net/sourceforge/filebot/resources/flags/sv.png b/source/net/filebot/resources/flags/sv.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/sv.png
rename to source/net/filebot/resources/flags/sv.png
diff --git a/source/net/sourceforge/filebot/resources/flags/th.png b/source/net/filebot/resources/flags/th.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/th.png
rename to source/net/filebot/resources/flags/th.png
diff --git a/source/net/sourceforge/filebot/resources/flags/tr.png b/source/net/filebot/resources/flags/tr.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/tr.png
rename to source/net/filebot/resources/flags/tr.png
diff --git a/source/net/sourceforge/filebot/resources/flags/undefined.png b/source/net/filebot/resources/flags/undefined.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/undefined.png
rename to source/net/filebot/resources/flags/undefined.png
diff --git a/source/net/sourceforge/filebot/resources/flags/vi.png b/source/net/filebot/resources/flags/vi.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/vi.png
rename to source/net/filebot/resources/flags/vi.png
diff --git a/source/net/sourceforge/filebot/resources/flags/zh.png b/source/net/filebot/resources/flags/zh.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/flags/zh.png
rename to source/net/filebot/resources/flags/zh.png
diff --git a/source/net/sourceforge/filebot/resources/message.donate.png b/source/net/filebot/resources/message.donate.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/message.donate.png
rename to source/net/filebot/resources/message.donate.png
diff --git a/source/net/sourceforge/filebot/resources/message.error.png b/source/net/filebot/resources/message.error.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/message.error.png
rename to source/net/filebot/resources/message.error.png
diff --git a/source/net/sourceforge/filebot/resources/message.info.png b/source/net/filebot/resources/message.info.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/message.info.png
rename to source/net/filebot/resources/message.info.png
diff --git a/source/net/sourceforge/filebot/resources/message.warning.png b/source/net/filebot/resources/message.warning.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/message.warning.png
rename to source/net/filebot/resources/message.warning.png
diff --git a/source/net/sourceforge/filebot/resources/package.extract.png b/source/net/filebot/resources/package.extract.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/package.extract.png
rename to source/net/filebot/resources/package.extract.png
diff --git a/source/net/sourceforge/filebot/resources/package.fetch.png b/source/net/filebot/resources/package.fetch.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/package.fetch.png
rename to source/net/filebot/resources/package.fetch.png
diff --git a/source/net/sourceforge/filebot/resources/panel.analyze.png b/source/net/filebot/resources/panel.analyze.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/panel.analyze.png
rename to source/net/filebot/resources/panel.analyze.png
diff --git a/source/net/sourceforge/filebot/resources/panel.episodelist.png b/source/net/filebot/resources/panel.episodelist.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/panel.episodelist.png
rename to source/net/filebot/resources/panel.episodelist.png
diff --git a/source/net/sourceforge/filebot/resources/panel.list.png b/source/net/filebot/resources/panel.list.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/panel.list.png
rename to source/net/filebot/resources/panel.list.png
diff --git a/source/net/sourceforge/filebot/resources/panel.rename.png b/source/net/filebot/resources/panel.rename.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/panel.rename.png
rename to source/net/filebot/resources/panel.rename.png
diff --git a/source/net/sourceforge/filebot/resources/panel.sfv.png b/source/net/filebot/resources/panel.sfv.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/panel.sfv.png
rename to source/net/filebot/resources/panel.sfv.png
diff --git a/source/net/sourceforge/filebot/resources/panel.subtitle.png b/source/net/filebot/resources/panel.subtitle.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/panel.subtitle.png
rename to source/net/filebot/resources/panel.subtitle.png
diff --git a/source/net/sourceforge/filebot/resources/rename.action.copy.png b/source/net/filebot/resources/rename.action.copy.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/rename.action.copy.png
rename to source/net/filebot/resources/rename.action.copy.png
diff --git a/source/net/sourceforge/filebot/resources/rename.action.hardlink.png b/source/net/filebot/resources/rename.action.hardlink.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/rename.action.hardlink.png
rename to source/net/filebot/resources/rename.action.hardlink.png
diff --git a/source/net/sourceforge/filebot/resources/rename.action.keeplink.png b/source/net/filebot/resources/rename.action.keeplink.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/rename.action.keeplink.png
rename to source/net/filebot/resources/rename.action.keeplink.png
diff --git a/source/net/sourceforge/filebot/resources/rename.action.move.png b/source/net/filebot/resources/rename.action.move.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/rename.action.move.png
rename to source/net/filebot/resources/rename.action.move.png
diff --git a/source/net/sourceforge/filebot/resources/rename.action.symlink.png b/source/net/filebot/resources/rename.action.symlink.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/rename.action.symlink.png
rename to source/net/filebot/resources/rename.action.symlink.png
diff --git a/source/net/sourceforge/filebot/resources/script.cancel.png b/source/net/filebot/resources/script.cancel.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/script.cancel.png
rename to source/net/filebot/resources/script.cancel.png
diff --git a/source/net/sourceforge/filebot/resources/script.go.png b/source/net/filebot/resources/script.go.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/script.go.png
rename to source/net/filebot/resources/script.go.png
diff --git a/source/net/sourceforge/filebot/resources/search.acoustid.png b/source/net/filebot/resources/search.acoustid.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/search.acoustid.png
rename to source/net/filebot/resources/search.acoustid.png
diff --git a/source/net/sourceforge/filebot/resources/search.anidb.png b/source/net/filebot/resources/search.anidb.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/search.anidb.png
rename to source/net/filebot/resources/search.anidb.png
diff --git a/source/net/sourceforge/filebot/resources/search.imdb.png b/source/net/filebot/resources/search.imdb.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/search.imdb.png
rename to source/net/filebot/resources/search.imdb.png
diff --git a/source/net/sourceforge/filebot/resources/search.mediainfo.png b/source/net/filebot/resources/search.mediainfo.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/search.mediainfo.png
rename to source/net/filebot/resources/search.mediainfo.png
diff --git a/source/net/sourceforge/filebot/resources/search.opensubtitles.png b/source/net/filebot/resources/search.opensubtitles.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/search.opensubtitles.png
rename to source/net/filebot/resources/search.opensubtitles.png
diff --git a/source/net/sourceforge/filebot/resources/search.serienjunkies.png b/source/net/filebot/resources/search.serienjunkies.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/search.serienjunkies.png
rename to source/net/filebot/resources/search.serienjunkies.png
diff --git a/source/net/sourceforge/filebot/resources/search.sublight.png b/source/net/filebot/resources/search.sublight.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/search.sublight.png
rename to source/net/filebot/resources/search.sublight.png
diff --git a/source/net/sourceforge/filebot/resources/search.subscene.png b/source/net/filebot/resources/search.subscene.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/search.subscene.png
rename to source/net/filebot/resources/search.subscene.png
diff --git a/source/net/sourceforge/filebot/resources/search.themoviedb.png b/source/net/filebot/resources/search.themoviedb.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/search.themoviedb.png
rename to source/net/filebot/resources/search.themoviedb.png
diff --git a/source/net/sourceforge/filebot/resources/search.thetvdb.png b/source/net/filebot/resources/search.thetvdb.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/search.thetvdb.png
rename to source/net/filebot/resources/search.thetvdb.png
diff --git a/source/net/sourceforge/filebot/resources/search.tvrage.png b/source/net/filebot/resources/search.tvrage.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/search.tvrage.png
rename to source/net/filebot/resources/search.tvrage.png
diff --git a/source/net/sourceforge/filebot/resources/status.error.png b/source/net/filebot/resources/status.error.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/status.error.png
rename to source/net/filebot/resources/status.error.png
diff --git a/source/net/sourceforge/filebot/resources/status.link.broken.png b/source/net/filebot/resources/status.link.broken.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/status.link.broken.png
rename to source/net/filebot/resources/status.link.broken.png
diff --git a/source/net/sourceforge/filebot/resources/status.link.ok.png b/source/net/filebot/resources/status.link.ok.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/status.link.ok.png
rename to source/net/filebot/resources/status.link.ok.png
diff --git a/source/net/sourceforge/filebot/resources/status.ok.png b/source/net/filebot/resources/status.ok.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/status.ok.png
rename to source/net/filebot/resources/status.ok.png
diff --git a/source/net/sourceforge/filebot/resources/status.unknown.png b/source/net/filebot/resources/status.unknown.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/status.unknown.png
rename to source/net/filebot/resources/status.unknown.png
diff --git a/source/net/sourceforge/filebot/resources/status.warning.png b/source/net/filebot/resources/status.warning.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/status.warning.png
rename to source/net/filebot/resources/status.warning.png
diff --git a/source/net/sourceforge/filebot/resources/subtitle.exact.download.png b/source/net/filebot/resources/subtitle.exact.download.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/subtitle.exact.download.png
rename to source/net/filebot/resources/subtitle.exact.download.png
diff --git a/source/net/sourceforge/filebot/resources/subtitle.exact.upload.png b/source/net/filebot/resources/subtitle.exact.upload.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/subtitle.exact.upload.png
rename to source/net/filebot/resources/subtitle.exact.upload.png
diff --git a/source/net/sourceforge/filebot/resources/tab.close.hover.png b/source/net/filebot/resources/tab.close.hover.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/tab.close.hover.png
rename to source/net/filebot/resources/tab.close.hover.png
diff --git a/source/net/sourceforge/filebot/resources/tab.close.png b/source/net/filebot/resources/tab.close.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/tab.close.png
rename to source/net/filebot/resources/tab.close.png
diff --git a/source/net/sourceforge/filebot/resources/tree.closed.png b/source/net/filebot/resources/tree.closed.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/tree.closed.png
rename to source/net/filebot/resources/tree.closed.png
diff --git a/source/net/sourceforge/filebot/resources/tree.collapse.png b/source/net/filebot/resources/tree.collapse.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/tree.collapse.png
rename to source/net/filebot/resources/tree.collapse.png
diff --git a/source/net/sourceforge/filebot/resources/tree.expand.png b/source/net/filebot/resources/tree.expand.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/tree.expand.png
rename to source/net/filebot/resources/tree.expand.png
diff --git a/source/net/sourceforge/filebot/resources/tree.leaf.png b/source/net/filebot/resources/tree.leaf.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/tree.leaf.png
rename to source/net/filebot/resources/tree.leaf.png
diff --git a/source/net/sourceforge/filebot/resources/tree.open.png b/source/net/filebot/resources/tree.open.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/tree.open.png
rename to source/net/filebot/resources/tree.open.png
diff --git a/source/net/sourceforge/filebot/resources/window.icon.large.png b/source/net/filebot/resources/window.icon.large.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/window.icon.large.png
rename to source/net/filebot/resources/window.icon.large.png
diff --git a/source/net/sourceforge/filebot/resources/window.icon.medium.png b/source/net/filebot/resources/window.icon.medium.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/window.icon.medium.png
rename to source/net/filebot/resources/window.icon.medium.png
diff --git a/source/net/sourceforge/filebot/resources/window.icon.small.png b/source/net/filebot/resources/window.icon.small.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/window.icon.small.png
rename to source/net/filebot/resources/window.icon.small.png
diff --git a/source/net/sourceforge/filebot/resources/worker.pending.png b/source/net/filebot/resources/worker.pending.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/worker.pending.png
rename to source/net/filebot/resources/worker.pending.png
diff --git a/source/net/sourceforge/filebot/resources/worker.started.png b/source/net/filebot/resources/worker.started.png
similarity index 100%
rename from source/net/sourceforge/filebot/resources/worker.started.png
rename to source/net/filebot/resources/worker.started.png
diff --git a/source/net/sourceforge/filebot/similarity/CommonSequenceMatcher.java b/source/net/filebot/similarity/CommonSequenceMatcher.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/CommonSequenceMatcher.java
rename to source/net/filebot/similarity/CommonSequenceMatcher.java
diff --git a/source/net/sourceforge/filebot/similarity/CrossPropertyMetric.java b/source/net/filebot/similarity/CrossPropertyMetric.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/CrossPropertyMetric.java
rename to source/net/filebot/similarity/CrossPropertyMetric.java
diff --git a/source/net/sourceforge/filebot/similarity/DateMatcher.java b/source/net/filebot/similarity/DateMatcher.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/DateMatcher.java
rename to source/net/filebot/similarity/DateMatcher.java
diff --git a/source/net/sourceforge/filebot/similarity/DateMetric.java b/source/net/filebot/similarity/DateMetric.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/DateMetric.java
rename to source/net/filebot/similarity/DateMetric.java
diff --git a/source/net/sourceforge/filebot/similarity/EpisodeMatcher.java b/source/net/filebot/similarity/EpisodeMatcher.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/EpisodeMatcher.java
rename to source/net/filebot/similarity/EpisodeMatcher.java
diff --git a/source/net/sourceforge/filebot/similarity/EpisodeMetrics.java b/source/net/filebot/similarity/EpisodeMetrics.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/EpisodeMetrics.java
rename to source/net/filebot/similarity/EpisodeMetrics.java
diff --git a/source/net/sourceforge/filebot/similarity/FileNameMetric.java b/source/net/filebot/similarity/FileNameMetric.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/FileNameMetric.java
rename to source/net/filebot/similarity/FileNameMetric.java
diff --git a/source/net/sourceforge/filebot/similarity/FileSizeMetric.java b/source/net/filebot/similarity/FileSizeMetric.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/FileSizeMetric.java
rename to source/net/filebot/similarity/FileSizeMetric.java
diff --git a/source/net/sourceforge/filebot/similarity/Match.java b/source/net/filebot/similarity/Match.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/Match.java
rename to source/net/filebot/similarity/Match.java
diff --git a/source/net/sourceforge/filebot/similarity/Matcher.java b/source/net/filebot/similarity/Matcher.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/Matcher.java
rename to source/net/filebot/similarity/Matcher.java
diff --git a/source/net/sourceforge/filebot/similarity/MetricAvg.java b/source/net/filebot/similarity/MetricAvg.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/MetricAvg.java
rename to source/net/filebot/similarity/MetricAvg.java
diff --git a/source/net/sourceforge/filebot/similarity/MetricCascade.java b/source/net/filebot/similarity/MetricCascade.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/MetricCascade.java
rename to source/net/filebot/similarity/MetricCascade.java
diff --git a/source/net/sourceforge/filebot/similarity/MetricMin.java b/source/net/filebot/similarity/MetricMin.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/MetricMin.java
rename to source/net/filebot/similarity/MetricMin.java
diff --git a/source/net/sourceforge/filebot/similarity/NameSimilarityMetric.java b/source/net/filebot/similarity/NameSimilarityMetric.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/NameSimilarityMetric.java
rename to source/net/filebot/similarity/NameSimilarityMetric.java
diff --git a/source/net/sourceforge/filebot/similarity/Normalization.java b/source/net/filebot/similarity/Normalization.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/Normalization.java
rename to source/net/filebot/similarity/Normalization.java
diff --git a/source/net/sourceforge/filebot/similarity/NumericSimilarityMetric.java b/source/net/filebot/similarity/NumericSimilarityMetric.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/NumericSimilarityMetric.java
rename to source/net/filebot/similarity/NumericSimilarityMetric.java
diff --git a/source/net/sourceforge/filebot/similarity/SeasonEpisodeMatcher.java b/source/net/filebot/similarity/SeasonEpisodeMatcher.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/SeasonEpisodeMatcher.java
rename to source/net/filebot/similarity/SeasonEpisodeMatcher.java
diff --git a/source/net/sourceforge/filebot/similarity/SeasonEpisodeMetric.java b/source/net/filebot/similarity/SeasonEpisodeMetric.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/SeasonEpisodeMetric.java
rename to source/net/filebot/similarity/SeasonEpisodeMetric.java
diff --git a/source/net/sourceforge/filebot/similarity/SequenceMatchSimilarity.java b/source/net/filebot/similarity/SequenceMatchSimilarity.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/SequenceMatchSimilarity.java
rename to source/net/filebot/similarity/SequenceMatchSimilarity.java
diff --git a/source/net/sourceforge/filebot/similarity/SeriesNameMatcher.java b/source/net/filebot/similarity/SeriesNameMatcher.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/SeriesNameMatcher.java
rename to source/net/filebot/similarity/SeriesNameMatcher.java
diff --git a/source/net/sourceforge/filebot/similarity/SimilarityComparator.java b/source/net/filebot/similarity/SimilarityComparator.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/SimilarityComparator.java
rename to source/net/filebot/similarity/SimilarityComparator.java
diff --git a/source/net/sourceforge/filebot/similarity/SimilarityMetric.java b/source/net/filebot/similarity/SimilarityMetric.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/SimilarityMetric.java
rename to source/net/filebot/similarity/SimilarityMetric.java
diff --git a/source/net/sourceforge/filebot/similarity/StrictEpisodeMetrics.java b/source/net/filebot/similarity/StrictEpisodeMetrics.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/StrictEpisodeMetrics.java
rename to source/net/filebot/similarity/StrictEpisodeMetrics.java
diff --git a/source/net/sourceforge/filebot/similarity/StringEqualsMetric.java b/source/net/filebot/similarity/StringEqualsMetric.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/StringEqualsMetric.java
rename to source/net/filebot/similarity/StringEqualsMetric.java
diff --git a/source/net/sourceforge/filebot/similarity/SubstringMetric.java b/source/net/filebot/similarity/SubstringMetric.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/SubstringMetric.java
rename to source/net/filebot/similarity/SubstringMetric.java
diff --git a/source/net/sourceforge/filebot/similarity/TimeStampMetric.java b/source/net/filebot/similarity/TimeStampMetric.java
similarity index 100%
rename from source/net/sourceforge/filebot/similarity/TimeStampMetric.java
rename to source/net/filebot/similarity/TimeStampMetric.java
diff --git a/source/net/sourceforge/filebot/subtitle/MicroDVDReader.java b/source/net/filebot/subtitle/MicroDVDReader.java
similarity index 100%
rename from source/net/sourceforge/filebot/subtitle/MicroDVDReader.java
rename to source/net/filebot/subtitle/MicroDVDReader.java
diff --git a/source/net/sourceforge/filebot/subtitle/SubRipReader.java b/source/net/filebot/subtitle/SubRipReader.java
similarity index 100%
rename from source/net/sourceforge/filebot/subtitle/SubRipReader.java
rename to source/net/filebot/subtitle/SubRipReader.java
diff --git a/source/net/sourceforge/filebot/subtitle/SubRipWriter.java b/source/net/filebot/subtitle/SubRipWriter.java
similarity index 100%
rename from source/net/sourceforge/filebot/subtitle/SubRipWriter.java
rename to source/net/filebot/subtitle/SubRipWriter.java
diff --git a/source/net/sourceforge/filebot/subtitle/SubStationAlphaReader.java b/source/net/filebot/subtitle/SubStationAlphaReader.java
similarity index 100%
rename from source/net/sourceforge/filebot/subtitle/SubStationAlphaReader.java
rename to source/net/filebot/subtitle/SubStationAlphaReader.java
diff --git a/source/net/sourceforge/filebot/subtitle/SubViewerReader.java b/source/net/filebot/subtitle/SubViewerReader.java
similarity index 100%
rename from source/net/sourceforge/filebot/subtitle/SubViewerReader.java
rename to source/net/filebot/subtitle/SubViewerReader.java
diff --git a/source/net/sourceforge/filebot/subtitle/SubtitleElement.java b/source/net/filebot/subtitle/SubtitleElement.java
similarity index 100%
rename from source/net/sourceforge/filebot/subtitle/SubtitleElement.java
rename to source/net/filebot/subtitle/SubtitleElement.java
diff --git a/source/net/sourceforge/filebot/subtitle/SubtitleFormat.java b/source/net/filebot/subtitle/SubtitleFormat.java
similarity index 100%
rename from source/net/sourceforge/filebot/subtitle/SubtitleFormat.java
rename to source/net/filebot/subtitle/SubtitleFormat.java
diff --git a/source/net/sourceforge/filebot/subtitle/SubtitleNaming.java b/source/net/filebot/subtitle/SubtitleNaming.java
similarity index 100%
rename from source/net/sourceforge/filebot/subtitle/SubtitleNaming.java
rename to source/net/filebot/subtitle/SubtitleNaming.java
diff --git a/source/net/sourceforge/filebot/subtitle/SubtitleReader.java b/source/net/filebot/subtitle/SubtitleReader.java
similarity index 100%
rename from source/net/sourceforge/filebot/subtitle/SubtitleReader.java
rename to source/net/filebot/subtitle/SubtitleReader.java
diff --git a/source/net/sourceforge/filebot/subtitle/SubtitleTimeFormat.java b/source/net/filebot/subtitle/SubtitleTimeFormat.java
similarity index 100%
rename from source/net/sourceforge/filebot/subtitle/SubtitleTimeFormat.java
rename to source/net/filebot/subtitle/SubtitleTimeFormat.java
diff --git a/source/net/sourceforge/filebot/subtitle/SubtitleUtilities.java b/source/net/filebot/subtitle/SubtitleUtilities.java
similarity index 100%
rename from source/net/sourceforge/filebot/subtitle/SubtitleUtilities.java
rename to source/net/filebot/subtitle/SubtitleUtilities.java
diff --git a/source/net/sourceforge/filebot/torrent/BDecoder.java b/source/net/filebot/torrent/BDecoder.java
similarity index 100%
rename from source/net/sourceforge/filebot/torrent/BDecoder.java
rename to source/net/filebot/torrent/BDecoder.java
diff --git a/source/net/sourceforge/filebot/torrent/Torrent.java b/source/net/filebot/torrent/Torrent.java
similarity index 100%
rename from source/net/sourceforge/filebot/torrent/Torrent.java
rename to source/net/filebot/torrent/Torrent.java
diff --git a/source/net/sourceforge/filebot/ui/AbstractSearchPanel.java b/source/net/filebot/ui/AbstractSearchPanel.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/AbstractSearchPanel.java
rename to source/net/filebot/ui/AbstractSearchPanel.java
diff --git a/source/net/sourceforge/filebot/ui/FileBotList.java b/source/net/filebot/ui/FileBotList.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/FileBotList.java
rename to source/net/filebot/ui/FileBotList.java
diff --git a/source/net/sourceforge/filebot/ui/FileBotListExportHandler.java b/source/net/filebot/ui/FileBotListExportHandler.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/FileBotListExportHandler.java
rename to source/net/filebot/ui/FileBotListExportHandler.java
diff --git a/source/net/sourceforge/filebot/ui/FileBotTab.java b/source/net/filebot/ui/FileBotTab.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/FileBotTab.java
rename to source/net/filebot/ui/FileBotTab.java
diff --git a/source/net/sourceforge/filebot/ui/FileBotTabComponent.java b/source/net/filebot/ui/FileBotTabComponent.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/FileBotTabComponent.java
rename to source/net/filebot/ui/FileBotTabComponent.java
diff --git a/source/net/sourceforge/filebot/ui/HeaderPanel.java b/source/net/filebot/ui/HeaderPanel.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/HeaderPanel.java
rename to source/net/filebot/ui/HeaderPanel.java
diff --git a/source/net/sourceforge/filebot/ui/HistoryPanel.java b/source/net/filebot/ui/HistoryPanel.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/HistoryPanel.java
rename to source/net/filebot/ui/HistoryPanel.java
diff --git a/source/net/sourceforge/filebot/ui/LanguageComboBox.java b/source/net/filebot/ui/LanguageComboBox.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/LanguageComboBox.java
rename to source/net/filebot/ui/LanguageComboBox.java
diff --git a/source/net/sourceforge/filebot/ui/LanguageComboBoxCellRenderer.java b/source/net/filebot/ui/LanguageComboBoxCellRenderer.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/LanguageComboBoxCellRenderer.java
rename to source/net/filebot/ui/LanguageComboBoxCellRenderer.java
diff --git a/source/net/sourceforge/filebot/ui/LanguageComboBoxModel.java b/source/net/filebot/ui/LanguageComboBoxModel.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/LanguageComboBoxModel.java
rename to source/net/filebot/ui/LanguageComboBoxModel.java
diff --git a/source/net/sourceforge/filebot/ui/MainFrame.java b/source/net/filebot/ui/MainFrame.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/MainFrame.java
rename to source/net/filebot/ui/MainFrame.java
diff --git a/source/net/sourceforge/filebot/ui/NotificationLogging.java b/source/net/filebot/ui/NotificationLogging.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/NotificationLogging.java
rename to source/net/filebot/ui/NotificationLogging.java
diff --git a/source/net/sourceforge/filebot/ui/PanelBuilder.java b/source/net/filebot/ui/PanelBuilder.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/PanelBuilder.java
rename to source/net/filebot/ui/PanelBuilder.java
diff --git a/source/net/sourceforge/filebot/ui/SelectButtonTextField.java b/source/net/filebot/ui/SelectButtonTextField.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/SelectButtonTextField.java
rename to source/net/filebot/ui/SelectButtonTextField.java
diff --git a/source/net/sourceforge/filebot/ui/SelectDialog.java b/source/net/filebot/ui/SelectDialog.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/SelectDialog.java
rename to source/net/filebot/ui/SelectDialog.java
diff --git a/source/net/sourceforge/filebot/ui/SinglePanelFrame.java b/source/net/filebot/ui/SinglePanelFrame.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/SinglePanelFrame.java
rename to source/net/filebot/ui/SinglePanelFrame.java
diff --git a/source/net/sourceforge/filebot/ui/analyze/AnalyzePanel.java b/source/net/filebot/ui/analyze/AnalyzePanel.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/analyze/AnalyzePanel.java
rename to source/net/filebot/ui/analyze/AnalyzePanel.java
diff --git a/source/net/sourceforge/filebot/ui/analyze/AnalyzePanelBuilder.java b/source/net/filebot/ui/analyze/AnalyzePanelBuilder.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/analyze/AnalyzePanelBuilder.java
rename to source/net/filebot/ui/analyze/AnalyzePanelBuilder.java
diff --git a/source/net/sourceforge/filebot/ui/analyze/AttributeTool.java b/source/net/filebot/ui/analyze/AttributeTool.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/analyze/AttributeTool.java
rename to source/net/filebot/ui/analyze/AttributeTool.java
diff --git a/source/net/sourceforge/filebot/ui/analyze/ExtractTool.java b/source/net/filebot/ui/analyze/ExtractTool.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/analyze/ExtractTool.java
rename to source/net/filebot/ui/analyze/ExtractTool.java
diff --git a/source/net/sourceforge/filebot/ui/analyze/FileTree.java b/source/net/filebot/ui/analyze/FileTree.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/analyze/FileTree.java
rename to source/net/filebot/ui/analyze/FileTree.java
diff --git a/source/net/sourceforge/filebot/ui/analyze/FileTreeCellRenderer.java b/source/net/filebot/ui/analyze/FileTreeCellRenderer.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/analyze/FileTreeCellRenderer.java
rename to source/net/filebot/ui/analyze/FileTreeCellRenderer.java
diff --git a/source/net/sourceforge/filebot/ui/analyze/FileTreeExportHandler.java b/source/net/filebot/ui/analyze/FileTreeExportHandler.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/analyze/FileTreeExportHandler.java
rename to source/net/filebot/ui/analyze/FileTreeExportHandler.java
diff --git a/source/net/sourceforge/filebot/ui/analyze/FileTreePanel.java b/source/net/filebot/ui/analyze/FileTreePanel.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/analyze/FileTreePanel.java
rename to source/net/filebot/ui/analyze/FileTreePanel.java
diff --git a/source/net/sourceforge/filebot/ui/analyze/FileTreeTransferablePolicy.java b/source/net/filebot/ui/analyze/FileTreeTransferablePolicy.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/analyze/FileTreeTransferablePolicy.java
rename to source/net/filebot/ui/analyze/FileTreeTransferablePolicy.java
diff --git a/source/net/sourceforge/filebot/ui/analyze/SplitTool.java b/source/net/filebot/ui/analyze/SplitTool.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/analyze/SplitTool.java
rename to source/net/filebot/ui/analyze/SplitTool.java
diff --git a/source/net/sourceforge/filebot/ui/analyze/Tool.java b/source/net/filebot/ui/analyze/Tool.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/analyze/Tool.java
rename to source/net/filebot/ui/analyze/Tool.java
diff --git a/source/net/sourceforge/filebot/ui/analyze/TypeTool.java b/source/net/filebot/ui/analyze/TypeTool.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/analyze/TypeTool.java
rename to source/net/filebot/ui/analyze/TypeTool.java
diff --git a/source/net/sourceforge/filebot/ui/episodelist/EpisodeListPanel.java b/source/net/filebot/ui/episodelist/EpisodeListPanel.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/episodelist/EpisodeListPanel.java
rename to source/net/filebot/ui/episodelist/EpisodeListPanel.java
diff --git a/source/net/sourceforge/filebot/ui/episodelist/EpisodeListPanelBuilder.java b/source/net/filebot/ui/episodelist/EpisodeListPanelBuilder.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/episodelist/EpisodeListPanelBuilder.java
rename to source/net/filebot/ui/episodelist/EpisodeListPanelBuilder.java
diff --git a/source/net/sourceforge/filebot/ui/episodelist/SeasonSpinnerEditor.java b/source/net/filebot/ui/episodelist/SeasonSpinnerEditor.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/episodelist/SeasonSpinnerEditor.java
rename to source/net/filebot/ui/episodelist/SeasonSpinnerEditor.java
diff --git a/source/net/sourceforge/filebot/ui/episodelist/SeasonSpinnerModel.java b/source/net/filebot/ui/episodelist/SeasonSpinnerModel.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/episodelist/SeasonSpinnerModel.java
rename to source/net/filebot/ui/episodelist/SeasonSpinnerModel.java
diff --git a/source/net/sourceforge/filebot/ui/list/FileListTransferablePolicy.java b/source/net/filebot/ui/list/FileListTransferablePolicy.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/list/FileListTransferablePolicy.java
rename to source/net/filebot/ui/list/FileListTransferablePolicy.java
diff --git a/source/net/sourceforge/filebot/ui/list/ListPanel.java b/source/net/filebot/ui/list/ListPanel.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/list/ListPanel.java
rename to source/net/filebot/ui/list/ListPanel.java
diff --git a/source/net/sourceforge/filebot/ui/list/ListPanelBuilder.java b/source/net/filebot/ui/list/ListPanelBuilder.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/list/ListPanelBuilder.java
rename to source/net/filebot/ui/list/ListPanelBuilder.java
diff --git a/source/net/sourceforge/filebot/ui/rename/AudioFingerprintMatcher.java b/source/net/filebot/ui/rename/AudioFingerprintMatcher.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/AudioFingerprintMatcher.java
rename to source/net/filebot/ui/rename/AudioFingerprintMatcher.java
diff --git a/source/net/sourceforge/filebot/ui/rename/AutoCompleteMatcher.java b/source/net/filebot/ui/rename/AutoCompleteMatcher.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/AutoCompleteMatcher.java
rename to source/net/filebot/ui/rename/AutoCompleteMatcher.java
diff --git a/source/net/sourceforge/filebot/ui/rename/BindingDialog.java b/source/net/filebot/ui/rename/BindingDialog.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/BindingDialog.java
rename to source/net/filebot/ui/rename/BindingDialog.java
diff --git a/source/net/sourceforge/filebot/ui/rename/BindingDialog.properties b/source/net/filebot/ui/rename/BindingDialog.properties
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/BindingDialog.properties
rename to source/net/filebot/ui/rename/BindingDialog.properties
diff --git a/source/net/sourceforge/filebot/ui/rename/CharacterHighlightPainter.java b/source/net/filebot/ui/rename/CharacterHighlightPainter.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/CharacterHighlightPainter.java
rename to source/net/filebot/ui/rename/CharacterHighlightPainter.java
diff --git a/source/net/sourceforge/filebot/ui/rename/EpisodeListMatcher.java b/source/net/filebot/ui/rename/EpisodeListMatcher.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/EpisodeListMatcher.java
rename to source/net/filebot/ui/rename/EpisodeListMatcher.java
diff --git a/source/net/sourceforge/filebot/ui/rename/ExpressionFormatter.java b/source/net/filebot/ui/rename/ExpressionFormatter.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/ExpressionFormatter.java
rename to source/net/filebot/ui/rename/ExpressionFormatter.java
diff --git a/source/net/sourceforge/filebot/ui/rename/FileNameFormatter.java b/source/net/filebot/ui/rename/FileNameFormatter.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/FileNameFormatter.java
rename to source/net/filebot/ui/rename/FileNameFormatter.java
diff --git a/source/net/sourceforge/filebot/ui/rename/FilesListTransferablePolicy.java b/source/net/filebot/ui/rename/FilesListTransferablePolicy.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/FilesListTransferablePolicy.java
rename to source/net/filebot/ui/rename/FilesListTransferablePolicy.java
diff --git a/source/net/sourceforge/filebot/ui/rename/FormatDialog.java b/source/net/filebot/ui/rename/FormatDialog.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/FormatDialog.java
rename to source/net/filebot/ui/rename/FormatDialog.java
diff --git a/source/net/sourceforge/filebot/ui/rename/FormatDialog.properties b/source/net/filebot/ui/rename/FormatDialog.properties
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/FormatDialog.properties
rename to source/net/filebot/ui/rename/FormatDialog.properties
diff --git a/source/net/sourceforge/filebot/ui/rename/HighlightListCellRenderer.java b/source/net/filebot/ui/rename/HighlightListCellRenderer.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/HighlightListCellRenderer.java
rename to source/net/filebot/ui/rename/HighlightListCellRenderer.java
diff --git a/source/net/sourceforge/filebot/ui/rename/HistoryDialog.java b/source/net/filebot/ui/rename/HistoryDialog.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/HistoryDialog.java
rename to source/net/filebot/ui/rename/HistoryDialog.java
diff --git a/source/net/sourceforge/filebot/ui/rename/MatchAction.java b/source/net/filebot/ui/rename/MatchAction.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/MatchAction.java
rename to source/net/filebot/ui/rename/MatchAction.java
diff --git a/source/net/sourceforge/filebot/ui/rename/MatchFormatter.java b/source/net/filebot/ui/rename/MatchFormatter.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/MatchFormatter.java
rename to source/net/filebot/ui/rename/MatchFormatter.java
diff --git a/source/net/sourceforge/filebot/ui/rename/MatchModel.java b/source/net/filebot/ui/rename/MatchModel.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/MatchModel.java
rename to source/net/filebot/ui/rename/MatchModel.java
diff --git a/source/net/sourceforge/filebot/ui/rename/MovieFormatter.java b/source/net/filebot/ui/rename/MovieFormatter.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/MovieFormatter.java
rename to source/net/filebot/ui/rename/MovieFormatter.java
diff --git a/source/net/sourceforge/filebot/ui/rename/MovieHashMatcher.java b/source/net/filebot/ui/rename/MovieHashMatcher.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/MovieHashMatcher.java
rename to source/net/filebot/ui/rename/MovieHashMatcher.java
diff --git a/source/net/sourceforge/filebot/ui/rename/NamesListTransferablePolicy.java b/source/net/filebot/ui/rename/NamesListTransferablePolicy.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/NamesListTransferablePolicy.java
rename to source/net/filebot/ui/rename/NamesListTransferablePolicy.java
diff --git a/source/net/sourceforge/filebot/ui/rename/RenameAction.java b/source/net/filebot/ui/rename/RenameAction.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/RenameAction.java
rename to source/net/filebot/ui/rename/RenameAction.java
diff --git a/source/net/sourceforge/filebot/ui/rename/RenameList.java b/source/net/filebot/ui/rename/RenameList.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/RenameList.java
rename to source/net/filebot/ui/rename/RenameList.java
diff --git a/source/net/sourceforge/filebot/ui/rename/RenameListCellRenderer.java b/source/net/filebot/ui/rename/RenameListCellRenderer.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/RenameListCellRenderer.java
rename to source/net/filebot/ui/rename/RenameListCellRenderer.java
diff --git a/source/net/sourceforge/filebot/ui/rename/RenameModel.java b/source/net/filebot/ui/rename/RenameModel.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/RenameModel.java
rename to source/net/filebot/ui/rename/RenameModel.java
diff --git a/source/net/sourceforge/filebot/ui/rename/RenamePanel.java b/source/net/filebot/ui/rename/RenamePanel.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/RenamePanel.java
rename to source/net/filebot/ui/rename/RenamePanel.java
diff --git a/source/net/sourceforge/filebot/ui/rename/RenamePanelBuilder.java b/source/net/filebot/ui/rename/RenamePanelBuilder.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/RenamePanelBuilder.java
rename to source/net/filebot/ui/rename/RenamePanelBuilder.java
diff --git a/source/net/sourceforge/filebot/ui/rename/ScrollPaneSynchronizer.java b/source/net/filebot/ui/rename/ScrollPaneSynchronizer.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/ScrollPaneSynchronizer.java
rename to source/net/filebot/ui/rename/ScrollPaneSynchronizer.java
diff --git a/source/net/sourceforge/filebot/ui/rename/ValidateDialog.java b/source/net/filebot/ui/rename/ValidateDialog.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/rename/ValidateDialog.java
rename to source/net/filebot/ui/rename/ValidateDialog.java
diff --git a/source/net/sourceforge/filebot/ui/sfv/ChecksumButton.java b/source/net/filebot/ui/sfv/ChecksumButton.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/sfv/ChecksumButton.java
rename to source/net/filebot/ui/sfv/ChecksumButton.java
diff --git a/source/net/sourceforge/filebot/ui/sfv/ChecksumCell.java b/source/net/filebot/ui/sfv/ChecksumCell.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/sfv/ChecksumCell.java
rename to source/net/filebot/ui/sfv/ChecksumCell.java
diff --git a/source/net/sourceforge/filebot/ui/sfv/ChecksumCellRenderer.java b/source/net/filebot/ui/sfv/ChecksumCellRenderer.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/sfv/ChecksumCellRenderer.java
rename to source/net/filebot/ui/sfv/ChecksumCellRenderer.java
diff --git a/source/net/sourceforge/filebot/ui/sfv/ChecksumComputationService.java b/source/net/filebot/ui/sfv/ChecksumComputationService.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/sfv/ChecksumComputationService.java
rename to source/net/filebot/ui/sfv/ChecksumComputationService.java
diff --git a/source/net/sourceforge/filebot/ui/sfv/ChecksumComputationTask.java b/source/net/filebot/ui/sfv/ChecksumComputationTask.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/sfv/ChecksumComputationTask.java
rename to source/net/filebot/ui/sfv/ChecksumComputationTask.java
diff --git a/source/net/sourceforge/filebot/ui/sfv/ChecksumRow.java b/source/net/filebot/ui/sfv/ChecksumRow.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/sfv/ChecksumRow.java
rename to source/net/filebot/ui/sfv/ChecksumRow.java
diff --git a/source/net/sourceforge/filebot/ui/sfv/ChecksumTable.java b/source/net/filebot/ui/sfv/ChecksumTable.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/sfv/ChecksumTable.java
rename to source/net/filebot/ui/sfv/ChecksumTable.java
diff --git a/source/net/sourceforge/filebot/ui/sfv/ChecksumTableExportHandler.java b/source/net/filebot/ui/sfv/ChecksumTableExportHandler.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/sfv/ChecksumTableExportHandler.java
rename to source/net/filebot/ui/sfv/ChecksumTableExportHandler.java
diff --git a/source/net/sourceforge/filebot/ui/sfv/ChecksumTableModel.java b/source/net/filebot/ui/sfv/ChecksumTableModel.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/sfv/ChecksumTableModel.java
rename to source/net/filebot/ui/sfv/ChecksumTableModel.java
diff --git a/source/net/sourceforge/filebot/ui/sfv/ChecksumTableTransferablePolicy.java b/source/net/filebot/ui/sfv/ChecksumTableTransferablePolicy.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/sfv/ChecksumTableTransferablePolicy.java
rename to source/net/filebot/ui/sfv/ChecksumTableTransferablePolicy.java
diff --git a/source/net/sourceforge/filebot/ui/sfv/HighlightPatternCellRenderer.java b/source/net/filebot/ui/sfv/HighlightPatternCellRenderer.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/sfv/HighlightPatternCellRenderer.java
rename to source/net/filebot/ui/sfv/HighlightPatternCellRenderer.java
diff --git a/source/net/sourceforge/filebot/ui/sfv/SfvPanel.java b/source/net/filebot/ui/sfv/SfvPanel.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/sfv/SfvPanel.java
rename to source/net/filebot/ui/sfv/SfvPanel.java
diff --git a/source/net/sourceforge/filebot/ui/sfv/SfvPanelBuilder.java b/source/net/filebot/ui/sfv/SfvPanelBuilder.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/sfv/SfvPanelBuilder.java
rename to source/net/filebot/ui/sfv/SfvPanelBuilder.java
diff --git a/source/net/sourceforge/filebot/ui/sfv/StateIconCellRenderer.java b/source/net/filebot/ui/sfv/StateIconCellRenderer.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/sfv/StateIconCellRenderer.java
rename to source/net/filebot/ui/sfv/StateIconCellRenderer.java
diff --git a/source/net/sourceforge/filebot/ui/sfv/SwingWorkerCellRenderer.java b/source/net/filebot/ui/sfv/SwingWorkerCellRenderer.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/sfv/SwingWorkerCellRenderer.java
rename to source/net/filebot/ui/sfv/SwingWorkerCellRenderer.java
diff --git a/source/net/sourceforge/filebot/ui/sfv/TotalProgressPanel.java b/source/net/filebot/ui/sfv/TotalProgressPanel.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/sfv/TotalProgressPanel.java
rename to source/net/filebot/ui/sfv/TotalProgressPanel.java
diff --git a/source/net/sourceforge/filebot/ui/subtitle/MemoryFileListExportHandler.java b/source/net/filebot/ui/subtitle/MemoryFileListExportHandler.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/subtitle/MemoryFileListExportHandler.java
rename to source/net/filebot/ui/subtitle/MemoryFileListExportHandler.java
diff --git a/source/net/sourceforge/filebot/ui/subtitle/SimpleComboBox.java b/source/net/filebot/ui/subtitle/SimpleComboBox.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/subtitle/SimpleComboBox.java
rename to source/net/filebot/ui/subtitle/SimpleComboBox.java
diff --git a/source/net/sourceforge/filebot/ui/subtitle/SubtitleAutoMatchDialog.java b/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/subtitle/SubtitleAutoMatchDialog.java
rename to source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java
diff --git a/source/net/sourceforge/filebot/ui/subtitle/SubtitleDownloadComponent.java b/source/net/filebot/ui/subtitle/SubtitleDownloadComponent.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/subtitle/SubtitleDownloadComponent.java
rename to source/net/filebot/ui/subtitle/SubtitleDownloadComponent.java
diff --git a/source/net/sourceforge/filebot/ui/subtitle/SubtitleDropTarget.java b/source/net/filebot/ui/subtitle/SubtitleDropTarget.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/subtitle/SubtitleDropTarget.java
rename to source/net/filebot/ui/subtitle/SubtitleDropTarget.java
diff --git a/source/net/sourceforge/filebot/ui/subtitle/SubtitleFileChooser.java b/source/net/filebot/ui/subtitle/SubtitleFileChooser.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/subtitle/SubtitleFileChooser.java
rename to source/net/filebot/ui/subtitle/SubtitleFileChooser.java
diff --git a/source/net/sourceforge/filebot/ui/subtitle/SubtitlePackage.java b/source/net/filebot/ui/subtitle/SubtitlePackage.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/subtitle/SubtitlePackage.java
rename to source/net/filebot/ui/subtitle/SubtitlePackage.java
diff --git a/source/net/sourceforge/filebot/ui/subtitle/SubtitlePackageCellRenderer.java b/source/net/filebot/ui/subtitle/SubtitlePackageCellRenderer.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/subtitle/SubtitlePackageCellRenderer.java
rename to source/net/filebot/ui/subtitle/SubtitlePackageCellRenderer.java
diff --git a/source/net/sourceforge/filebot/ui/subtitle/SubtitlePanel.java b/source/net/filebot/ui/subtitle/SubtitlePanel.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/subtitle/SubtitlePanel.java
rename to source/net/filebot/ui/subtitle/SubtitlePanel.java
diff --git a/source/net/sourceforge/filebot/ui/subtitle/SubtitlePanelBuilder.java b/source/net/filebot/ui/subtitle/SubtitlePanelBuilder.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/subtitle/SubtitlePanelBuilder.java
rename to source/net/filebot/ui/subtitle/SubtitlePanelBuilder.java
diff --git a/source/net/sourceforge/filebot/ui/subtitle/SubtitleUploadDialog.java b/source/net/filebot/ui/subtitle/SubtitleUploadDialog.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/subtitle/SubtitleUploadDialog.java
rename to source/net/filebot/ui/subtitle/SubtitleUploadDialog.java
diff --git a/source/net/sourceforge/filebot/ui/subtitle/SubtitleViewer.java b/source/net/filebot/ui/subtitle/SubtitleViewer.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/subtitle/SubtitleViewer.java
rename to source/net/filebot/ui/subtitle/SubtitleViewer.java
diff --git a/source/net/sourceforge/filebot/ui/transfer/ArrayTransferable.java b/source/net/filebot/ui/transfer/ArrayTransferable.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/transfer/ArrayTransferable.java
rename to source/net/filebot/ui/transfer/ArrayTransferable.java
diff --git a/source/net/sourceforge/filebot/ui/transfer/BackgroundFileTransferablePolicy.java b/source/net/filebot/ui/transfer/BackgroundFileTransferablePolicy.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/transfer/BackgroundFileTransferablePolicy.java
rename to source/net/filebot/ui/transfer/BackgroundFileTransferablePolicy.java
diff --git a/source/net/sourceforge/filebot/ui/transfer/ByteBufferTransferable.java b/source/net/filebot/ui/transfer/ByteBufferTransferable.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/transfer/ByteBufferTransferable.java
rename to source/net/filebot/ui/transfer/ByteBufferTransferable.java
diff --git a/source/net/sourceforge/filebot/ui/transfer/ClipboardHandler.java b/source/net/filebot/ui/transfer/ClipboardHandler.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/transfer/ClipboardHandler.java
rename to source/net/filebot/ui/transfer/ClipboardHandler.java
diff --git a/source/net/sourceforge/filebot/ui/transfer/CompositeTranserable.java b/source/net/filebot/ui/transfer/CompositeTranserable.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/transfer/CompositeTranserable.java
rename to source/net/filebot/ui/transfer/CompositeTranserable.java
diff --git a/source/net/sourceforge/filebot/ui/transfer/DefaultClipboardHandler.java b/source/net/filebot/ui/transfer/DefaultClipboardHandler.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/transfer/DefaultClipboardHandler.java
rename to source/net/filebot/ui/transfer/DefaultClipboardHandler.java
diff --git a/source/net/sourceforge/filebot/ui/transfer/DefaultTransferHandler.java b/source/net/filebot/ui/transfer/DefaultTransferHandler.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/transfer/DefaultTransferHandler.java
rename to source/net/filebot/ui/transfer/DefaultTransferHandler.java
diff --git a/source/net/sourceforge/filebot/ui/transfer/FileExportHandler.java b/source/net/filebot/ui/transfer/FileExportHandler.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/transfer/FileExportHandler.java
rename to source/net/filebot/ui/transfer/FileExportHandler.java
diff --git a/source/net/sourceforge/filebot/ui/transfer/FileTransferable.java b/source/net/filebot/ui/transfer/FileTransferable.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/transfer/FileTransferable.java
rename to source/net/filebot/ui/transfer/FileTransferable.java
diff --git a/source/net/sourceforge/filebot/ui/transfer/FileTransferablePolicy.java b/source/net/filebot/ui/transfer/FileTransferablePolicy.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/transfer/FileTransferablePolicy.java
rename to source/net/filebot/ui/transfer/FileTransferablePolicy.java
diff --git a/source/net/sourceforge/filebot/ui/transfer/LoadAction.java b/source/net/filebot/ui/transfer/LoadAction.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/transfer/LoadAction.java
rename to source/net/filebot/ui/transfer/LoadAction.java
diff --git a/source/net/sourceforge/filebot/ui/transfer/SaveAction.java b/source/net/filebot/ui/transfer/SaveAction.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/transfer/SaveAction.java
rename to source/net/filebot/ui/transfer/SaveAction.java
diff --git a/source/net/sourceforge/filebot/ui/transfer/TextFileExportHandler.java b/source/net/filebot/ui/transfer/TextFileExportHandler.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/transfer/TextFileExportHandler.java
rename to source/net/filebot/ui/transfer/TextFileExportHandler.java
diff --git a/source/net/sourceforge/filebot/ui/transfer/TextFileTransferable.java b/source/net/filebot/ui/transfer/TextFileTransferable.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/transfer/TextFileTransferable.java
rename to source/net/filebot/ui/transfer/TextFileTransferable.java
diff --git a/source/net/sourceforge/filebot/ui/transfer/TransferableExportHandler.java b/source/net/filebot/ui/transfer/TransferableExportHandler.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/transfer/TransferableExportHandler.java
rename to source/net/filebot/ui/transfer/TransferableExportHandler.java
diff --git a/source/net/sourceforge/filebot/ui/transfer/TransferablePolicy.java b/source/net/filebot/ui/transfer/TransferablePolicy.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/transfer/TransferablePolicy.java
rename to source/net/filebot/ui/transfer/TransferablePolicy.java
diff --git a/source/net/sourceforge/filebot/ui/transfer/TransferablePolicyFileFilter.java b/source/net/filebot/ui/transfer/TransferablePolicyFileFilter.java
similarity index 100%
rename from source/net/sourceforge/filebot/ui/transfer/TransferablePolicyFileFilter.java
rename to source/net/filebot/ui/transfer/TransferablePolicyFileFilter.java
diff --git a/source/net/sourceforge/filebot/util/ByteBufferInputStream.java b/source/net/filebot/util/ByteBufferInputStream.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ByteBufferInputStream.java
rename to source/net/filebot/util/ByteBufferInputStream.java
diff --git a/source/net/sourceforge/filebot/util/ByteBufferOutputStream.java b/source/net/filebot/util/ByteBufferOutputStream.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ByteBufferOutputStream.java
rename to source/net/filebot/util/ByteBufferOutputStream.java
diff --git a/source/net/sourceforge/filebot/util/DefaultThreadFactory.java b/source/net/filebot/util/DefaultThreadFactory.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/DefaultThreadFactory.java
rename to source/net/filebot/util/DefaultThreadFactory.java
diff --git a/source/net/sourceforge/filebot/util/DownloadTask.java b/source/net/filebot/util/DownloadTask.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/DownloadTask.java
rename to source/net/filebot/util/DownloadTask.java
diff --git a/source/net/sourceforge/filebot/util/ExceptionUtilities.java b/source/net/filebot/util/ExceptionUtilities.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ExceptionUtilities.java
rename to source/net/filebot/util/ExceptionUtilities.java
diff --git a/source/net/sourceforge/filebot/util/FastFile.java b/source/net/filebot/util/FastFile.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/FastFile.java
rename to source/net/filebot/util/FastFile.java
diff --git a/source/net/sourceforge/filebot/util/FileUtilities.java b/source/net/filebot/util/FileUtilities.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/FileUtilities.java
rename to source/net/filebot/util/FileUtilities.java
diff --git a/source/net/sourceforge/filebot/util/FilterIterator.java b/source/net/filebot/util/FilterIterator.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/FilterIterator.java
rename to source/net/filebot/util/FilterIterator.java
diff --git a/source/net/sourceforge/filebot/util/ListChangeSynchronizer.java b/source/net/filebot/util/ListChangeSynchronizer.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ListChangeSynchronizer.java
rename to source/net/filebot/util/ListChangeSynchronizer.java
diff --git a/source/net/sourceforge/filebot/util/PreferencesList.java b/source/net/filebot/util/PreferencesList.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/PreferencesList.java
rename to source/net/filebot/util/PreferencesList.java
diff --git a/source/net/sourceforge/filebot/util/PreferencesMap.java b/source/net/filebot/util/PreferencesMap.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/PreferencesMap.java
rename to source/net/filebot/util/PreferencesMap.java
diff --git a/source/net/sourceforge/filebot/util/StringUtilities.java b/source/net/filebot/util/StringUtilities.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/StringUtilities.java
rename to source/net/filebot/util/StringUtilities.java
diff --git a/source/net/sourceforge/filebot/util/TeePrintStream.java b/source/net/filebot/util/TeePrintStream.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/TeePrintStream.java
rename to source/net/filebot/util/TeePrintStream.java
diff --git a/source/net/sourceforge/filebot/util/TemporaryFolder.java b/source/net/filebot/util/TemporaryFolder.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/TemporaryFolder.java
rename to source/net/filebot/util/TemporaryFolder.java
diff --git a/source/net/sourceforge/filebot/util/Timer.java b/source/net/filebot/util/Timer.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/Timer.java
rename to source/net/filebot/util/Timer.java
diff --git a/source/net/sourceforge/filebot/util/TreeIterator.java b/source/net/filebot/util/TreeIterator.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/TreeIterator.java
rename to source/net/filebot/util/TreeIterator.java
diff --git a/source/net/sourceforge/filebot/util/XPathUtilities.java b/source/net/filebot/util/XPathUtilities.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/XPathUtilities.java
rename to source/net/filebot/util/XPathUtilities.java
diff --git a/source/net/sourceforge/filebot/util/prefs/FilePreferences.java b/source/net/filebot/util/prefs/FilePreferences.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/prefs/FilePreferences.java
rename to source/net/filebot/util/prefs/FilePreferences.java
diff --git a/source/net/sourceforge/filebot/util/prefs/FilePreferencesFactory.java b/source/net/filebot/util/prefs/FilePreferencesFactory.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/prefs/FilePreferencesFactory.java
rename to source/net/filebot/util/prefs/FilePreferencesFactory.java
diff --git a/source/net/sourceforge/filebot/util/ui/AbstractBean.java b/source/net/filebot/util/ui/AbstractBean.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/AbstractBean.java
rename to source/net/filebot/util/ui/AbstractBean.java
diff --git a/source/net/sourceforge/filebot/util/ui/AbstractFancyListCellRenderer.java b/source/net/filebot/util/ui/AbstractFancyListCellRenderer.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/AbstractFancyListCellRenderer.java
rename to source/net/filebot/util/ui/AbstractFancyListCellRenderer.java
diff --git a/source/net/sourceforge/filebot/util/ui/ActionPopup.java b/source/net/filebot/util/ui/ActionPopup.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/ActionPopup.java
rename to source/net/filebot/util/ui/ActionPopup.java
diff --git a/source/net/sourceforge/filebot/util/ui/ColorTintImageFilter.java b/source/net/filebot/util/ui/ColorTintImageFilter.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/ColorTintImageFilter.java
rename to source/net/filebot/util/ui/ColorTintImageFilter.java
diff --git a/source/net/sourceforge/filebot/util/ui/DashedSeparator.java b/source/net/filebot/util/ui/DashedSeparator.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/DashedSeparator.java
rename to source/net/filebot/util/ui/DashedSeparator.java
diff --git a/source/net/sourceforge/filebot/util/ui/DefaultFancyListCellRenderer.java b/source/net/filebot/util/ui/DefaultFancyListCellRenderer.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/DefaultFancyListCellRenderer.java
rename to source/net/filebot/util/ui/DefaultFancyListCellRenderer.java
diff --git a/source/net/sourceforge/filebot/util/ui/EmptySelectionModel.java b/source/net/filebot/util/ui/EmptySelectionModel.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/EmptySelectionModel.java
rename to source/net/filebot/util/ui/EmptySelectionModel.java
diff --git a/source/net/sourceforge/filebot/util/ui/FancyTreeCellRenderer.java b/source/net/filebot/util/ui/FancyTreeCellRenderer.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/FancyTreeCellRenderer.java
rename to source/net/filebot/util/ui/FancyTreeCellRenderer.java
diff --git a/source/net/sourceforge/filebot/util/ui/GradientStyle.java b/source/net/filebot/util/ui/GradientStyle.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/GradientStyle.java
rename to source/net/filebot/util/ui/GradientStyle.java
diff --git a/source/net/sourceforge/filebot/util/ui/LabelProvider.java b/source/net/filebot/util/ui/LabelProvider.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/LabelProvider.java
rename to source/net/filebot/util/ui/LabelProvider.java
diff --git a/source/net/sourceforge/filebot/util/ui/LazyDocumentListener.java b/source/net/filebot/util/ui/LazyDocumentListener.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/LazyDocumentListener.java
rename to source/net/filebot/util/ui/LazyDocumentListener.java
diff --git a/source/net/sourceforge/filebot/util/ui/LinkButton.java b/source/net/filebot/util/ui/LinkButton.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/LinkButton.java
rename to source/net/filebot/util/ui/LinkButton.java
diff --git a/source/net/sourceforge/filebot/util/ui/ListView.java b/source/net/filebot/util/ui/ListView.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/ListView.java
rename to source/net/filebot/util/ui/ListView.java
diff --git a/source/net/sourceforge/filebot/util/ui/LoadingOverlayPane.java b/source/net/filebot/util/ui/LoadingOverlayPane.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/LoadingOverlayPane.java
rename to source/net/filebot/util/ui/LoadingOverlayPane.java
diff --git a/source/net/sourceforge/filebot/util/ui/NullLabelProvider.java b/source/net/filebot/util/ui/NullLabelProvider.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/NullLabelProvider.java
rename to source/net/filebot/util/ui/NullLabelProvider.java
diff --git a/source/net/sourceforge/filebot/util/ui/ProgressDialog.java b/source/net/filebot/util/ui/ProgressDialog.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/ProgressDialog.java
rename to source/net/filebot/util/ui/ProgressDialog.java
diff --git a/source/net/sourceforge/filebot/util/ui/ProgressIndicator.java b/source/net/filebot/util/ui/ProgressIndicator.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/ProgressIndicator.java
rename to source/net/filebot/util/ui/ProgressIndicator.java
diff --git a/source/net/sourceforge/filebot/util/ui/RoundBorder.java b/source/net/filebot/util/ui/RoundBorder.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/RoundBorder.java
rename to source/net/filebot/util/ui/RoundBorder.java
diff --git a/source/net/sourceforge/filebot/util/ui/SelectButton.java b/source/net/filebot/util/ui/SelectButton.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/SelectButton.java
rename to source/net/filebot/util/ui/SelectButton.java
diff --git a/source/net/sourceforge/filebot/util/ui/ShadowBorder.java b/source/net/filebot/util/ui/ShadowBorder.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/ShadowBorder.java
rename to source/net/filebot/util/ui/ShadowBorder.java
diff --git a/source/net/sourceforge/filebot/util/ui/SimpleLabelProvider.java b/source/net/filebot/util/ui/SimpleLabelProvider.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/SimpleLabelProvider.java
rename to source/net/filebot/util/ui/SimpleLabelProvider.java
diff --git a/source/net/sourceforge/filebot/util/ui/SwingWorkerPropertyChangeAdapter.java b/source/net/filebot/util/ui/SwingWorkerPropertyChangeAdapter.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/SwingWorkerPropertyChangeAdapter.java
rename to source/net/filebot/util/ui/SwingWorkerPropertyChangeAdapter.java
diff --git a/source/net/sourceforge/filebot/util/ui/TunedUtilities.java b/source/net/filebot/util/ui/TunedUtilities.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/TunedUtilities.java
rename to source/net/filebot/util/ui/TunedUtilities.java
diff --git a/source/net/sourceforge/filebot/util/ui/notification/Direction.java b/source/net/filebot/util/ui/notification/Direction.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/notification/Direction.java
rename to source/net/filebot/util/ui/notification/Direction.java
diff --git a/source/net/sourceforge/filebot/util/ui/notification/MessageNotification.java b/source/net/filebot/util/ui/notification/MessageNotification.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/notification/MessageNotification.java
rename to source/net/filebot/util/ui/notification/MessageNotification.java
diff --git a/source/net/sourceforge/filebot/util/ui/notification/NotificationLayout.java b/source/net/filebot/util/ui/notification/NotificationLayout.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/notification/NotificationLayout.java
rename to source/net/filebot/util/ui/notification/NotificationLayout.java
diff --git a/source/net/sourceforge/filebot/util/ui/notification/NotificationManager.java b/source/net/filebot/util/ui/notification/NotificationManager.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/notification/NotificationManager.java
rename to source/net/filebot/util/ui/notification/NotificationManager.java
diff --git a/source/net/sourceforge/filebot/util/ui/notification/NotificationWindow.java b/source/net/filebot/util/ui/notification/NotificationWindow.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/notification/NotificationWindow.java
rename to source/net/filebot/util/ui/notification/NotificationWindow.java
diff --git a/source/net/sourceforge/filebot/util/ui/notification/QueueNotificationLayout.java b/source/net/filebot/util/ui/notification/QueueNotificationLayout.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/notification/QueueNotificationLayout.java
rename to source/net/filebot/util/ui/notification/QueueNotificationLayout.java
diff --git a/source/net/sourceforge/filebot/util/ui/notification/SeparatorBorder.java b/source/net/filebot/util/ui/notification/SeparatorBorder.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/notification/SeparatorBorder.java
rename to source/net/filebot/util/ui/notification/SeparatorBorder.java
diff --git a/source/net/sourceforge/filebot/util/ui/notification/SimpleNotificationLayout.java b/source/net/filebot/util/ui/notification/SimpleNotificationLayout.java
similarity index 100%
rename from source/net/sourceforge/filebot/util/ui/notification/SimpleNotificationLayout.java
rename to source/net/filebot/util/ui/notification/SimpleNotificationLayout.java
diff --git a/source/net/sourceforge/filebot/vfs/ArchiveType.java b/source/net/filebot/vfs/ArchiveType.java
similarity index 100%
rename from source/net/sourceforge/filebot/vfs/ArchiveType.java
rename to source/net/filebot/vfs/ArchiveType.java
diff --git a/source/net/sourceforge/filebot/vfs/FileInfo.java b/source/net/filebot/vfs/FileInfo.java
similarity index 100%
rename from source/net/sourceforge/filebot/vfs/FileInfo.java
rename to source/net/filebot/vfs/FileInfo.java
diff --git a/source/net/sourceforge/filebot/vfs/MemoryFile.java b/source/net/filebot/vfs/MemoryFile.java
similarity index 100%
rename from source/net/sourceforge/filebot/vfs/MemoryFile.java
rename to source/net/filebot/vfs/MemoryFile.java
diff --git a/source/net/sourceforge/filebot/vfs/RarArchive.java b/source/net/filebot/vfs/RarArchive.java
similarity index 100%
rename from source/net/sourceforge/filebot/vfs/RarArchive.java
rename to source/net/filebot/vfs/RarArchive.java
diff --git a/source/net/sourceforge/filebot/vfs/SimpleFileInfo.java b/source/net/filebot/vfs/SimpleFileInfo.java
similarity index 100%
rename from source/net/sourceforge/filebot/vfs/SimpleFileInfo.java
rename to source/net/filebot/vfs/SimpleFileInfo.java
diff --git a/source/net/sourceforge/filebot/vfs/ZipArchive.java b/source/net/filebot/vfs/ZipArchive.java
similarity index 100%
rename from source/net/sourceforge/filebot/vfs/ZipArchive.java
rename to source/net/filebot/vfs/ZipArchive.java
diff --git a/source/net/sourceforge/filebot/web/AbstractCachedResource.java b/source/net/filebot/web/AbstractCachedResource.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/AbstractCachedResource.java
rename to source/net/filebot/web/AbstractCachedResource.java
diff --git a/source/net/sourceforge/filebot/web/AbstractEpisodeListProvider.java b/source/net/filebot/web/AbstractEpisodeListProvider.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/AbstractEpisodeListProvider.java
rename to source/net/filebot/web/AbstractEpisodeListProvider.java
diff --git a/source/net/sourceforge/filebot/web/AcoustIDClient.java b/source/net/filebot/web/AcoustIDClient.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/AcoustIDClient.java
rename to source/net/filebot/web/AcoustIDClient.java
diff --git a/source/net/sourceforge/filebot/web/AnidbClient.java b/source/net/filebot/web/AnidbClient.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/AnidbClient.java
rename to source/net/filebot/web/AnidbClient.java
diff --git a/source/net/sourceforge/filebot/web/AnidbSearchResult.java b/source/net/filebot/web/AnidbSearchResult.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/AnidbSearchResult.java
rename to source/net/filebot/web/AnidbSearchResult.java
diff --git a/source/net/sourceforge/filebot/web/AudioTrack.java b/source/net/filebot/web/AudioTrack.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/AudioTrack.java
rename to source/net/filebot/web/AudioTrack.java
diff --git a/source/net/sourceforge/filebot/web/AudioTrackFormat.java b/source/net/filebot/web/AudioTrackFormat.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/AudioTrackFormat.java
rename to source/net/filebot/web/AudioTrackFormat.java
diff --git a/source/net/sourceforge/filebot/web/CachedPage.java b/source/net/filebot/web/CachedPage.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/CachedPage.java
rename to source/net/filebot/web/CachedPage.java
diff --git a/source/net/sourceforge/filebot/web/CachedResource.java b/source/net/filebot/web/CachedResource.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/CachedResource.java
rename to source/net/filebot/web/CachedResource.java
diff --git a/source/net/sourceforge/filebot/web/CachedXmlResource.java b/source/net/filebot/web/CachedXmlResource.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/CachedXmlResource.java
rename to source/net/filebot/web/CachedXmlResource.java
diff --git a/source/net/sourceforge/filebot/web/ETagCachedResource.java b/source/net/filebot/web/ETagCachedResource.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/ETagCachedResource.java
rename to source/net/filebot/web/ETagCachedResource.java
diff --git a/source/net/sourceforge/filebot/web/Episode.java b/source/net/filebot/web/Episode.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/Episode.java
rename to source/net/filebot/web/Episode.java
diff --git a/source/net/sourceforge/filebot/web/EpisodeFormat.java b/source/net/filebot/web/EpisodeFormat.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/EpisodeFormat.java
rename to source/net/filebot/web/EpisodeFormat.java
diff --git a/source/net/sourceforge/filebot/web/EpisodeListProvider.java b/source/net/filebot/web/EpisodeListProvider.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/EpisodeListProvider.java
rename to source/net/filebot/web/EpisodeListProvider.java
diff --git a/source/net/sourceforge/filebot/web/EpisodeUtilities.java b/source/net/filebot/web/EpisodeUtilities.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/EpisodeUtilities.java
rename to source/net/filebot/web/EpisodeUtilities.java
diff --git a/source/net/sourceforge/filebot/web/FanartTVClient.java b/source/net/filebot/web/FanartTVClient.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/FanartTVClient.java
rename to source/net/filebot/web/FanartTVClient.java
diff --git a/source/net/sourceforge/filebot/web/FloodLimit.java b/source/net/filebot/web/FloodLimit.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/FloodLimit.java
rename to source/net/filebot/web/FloodLimit.java
diff --git a/source/net/sourceforge/filebot/web/HyperLink.java b/source/net/filebot/web/HyperLink.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/HyperLink.java
rename to source/net/filebot/web/HyperLink.java
diff --git a/source/net/sourceforge/filebot/web/ID3Lookup.java b/source/net/filebot/web/ID3Lookup.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/ID3Lookup.java
rename to source/net/filebot/web/ID3Lookup.java
diff --git a/source/net/sourceforge/filebot/web/IMDbClient.java b/source/net/filebot/web/IMDbClient.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/IMDbClient.java
rename to source/net/filebot/web/IMDbClient.java
diff --git a/source/net/sourceforge/filebot/web/LocalSearch.java b/source/net/filebot/web/LocalSearch.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/LocalSearch.java
rename to source/net/filebot/web/LocalSearch.java
diff --git a/source/net/sourceforge/filebot/web/Movie.java b/source/net/filebot/web/Movie.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/Movie.java
rename to source/net/filebot/web/Movie.java
diff --git a/source/net/sourceforge/filebot/web/MovieFormat.java b/source/net/filebot/web/MovieFormat.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/MovieFormat.java
rename to source/net/filebot/web/MovieFormat.java
diff --git a/source/net/sourceforge/filebot/web/MovieIdentificationService.java b/source/net/filebot/web/MovieIdentificationService.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/MovieIdentificationService.java
rename to source/net/filebot/web/MovieIdentificationService.java
diff --git a/source/net/sourceforge/filebot/web/MoviePart.java b/source/net/filebot/web/MoviePart.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/MoviePart.java
rename to source/net/filebot/web/MoviePart.java
diff --git a/source/net/sourceforge/filebot/web/MultiEpisode.java b/source/net/filebot/web/MultiEpisode.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/MultiEpisode.java
rename to source/net/filebot/web/MultiEpisode.java
diff --git a/source/net/sourceforge/filebot/web/MusicIdentificationService.java b/source/net/filebot/web/MusicIdentificationService.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/MusicIdentificationService.java
rename to source/net/filebot/web/MusicIdentificationService.java
diff --git a/source/net/sourceforge/filebot/web/OpenSubtitlesClient.java b/source/net/filebot/web/OpenSubtitlesClient.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/OpenSubtitlesClient.java
rename to source/net/filebot/web/OpenSubtitlesClient.java
diff --git a/source/net/sourceforge/filebot/web/OpenSubtitlesHasher.java b/source/net/filebot/web/OpenSubtitlesHasher.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/OpenSubtitlesHasher.java
rename to source/net/filebot/web/OpenSubtitlesHasher.java
diff --git a/source/net/sourceforge/filebot/web/OpenSubtitlesSubtitleDescriptor.java b/source/net/filebot/web/OpenSubtitlesSubtitleDescriptor.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/OpenSubtitlesSubtitleDescriptor.java
rename to source/net/filebot/web/OpenSubtitlesSubtitleDescriptor.java
diff --git a/source/net/sourceforge/filebot/web/OpenSubtitlesXmlRpc.java b/source/net/filebot/web/OpenSubtitlesXmlRpc.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/OpenSubtitlesXmlRpc.java
rename to source/net/filebot/web/OpenSubtitlesXmlRpc.java
diff --git a/source/net/sourceforge/filebot/web/SearchResult.java b/source/net/filebot/web/SearchResult.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/SearchResult.java
rename to source/net/filebot/web/SearchResult.java
diff --git a/source/net/sourceforge/filebot/web/SeasonOutOfBoundsException.java b/source/net/filebot/web/SeasonOutOfBoundsException.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/SeasonOutOfBoundsException.java
rename to source/net/filebot/web/SeasonOutOfBoundsException.java
diff --git a/source/net/sourceforge/filebot/web/SerienjunkiesClient.java b/source/net/filebot/web/SerienjunkiesClient.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/SerienjunkiesClient.java
rename to source/net/filebot/web/SerienjunkiesClient.java
diff --git a/source/net/sourceforge/filebot/web/SerienjunkiesSearchResult.java b/source/net/filebot/web/SerienjunkiesSearchResult.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/SerienjunkiesSearchResult.java
rename to source/net/filebot/web/SerienjunkiesSearchResult.java
diff --git a/source/net/sourceforge/filebot/web/SimpleDate.java b/source/net/filebot/web/SimpleDate.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/SimpleDate.java
rename to source/net/filebot/web/SimpleDate.java
diff --git a/source/net/sourceforge/filebot/web/SortOrder.java b/source/net/filebot/web/SortOrder.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/SortOrder.java
rename to source/net/filebot/web/SortOrder.java
diff --git a/source/net/sourceforge/filebot/web/SubtitleDescriptor.java b/source/net/filebot/web/SubtitleDescriptor.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/SubtitleDescriptor.java
rename to source/net/filebot/web/SubtitleDescriptor.java
diff --git a/source/net/sourceforge/filebot/web/SubtitleProvider.java b/source/net/filebot/web/SubtitleProvider.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/SubtitleProvider.java
rename to source/net/filebot/web/SubtitleProvider.java
diff --git a/source/net/sourceforge/filebot/web/TMDbClient.java b/source/net/filebot/web/TMDbClient.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/TMDbClient.java
rename to source/net/filebot/web/TMDbClient.java
diff --git a/source/net/sourceforge/filebot/web/TVRageClient.java b/source/net/filebot/web/TVRageClient.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/TVRageClient.java
rename to source/net/filebot/web/TVRageClient.java
diff --git a/source/net/sourceforge/filebot/web/TVRageSearchResult.java b/source/net/filebot/web/TVRageSearchResult.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/TVRageSearchResult.java
rename to source/net/filebot/web/TVRageSearchResult.java
diff --git a/source/net/sourceforge/filebot/web/TheTVDBClient.java b/source/net/filebot/web/TheTVDBClient.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/TheTVDBClient.java
rename to source/net/filebot/web/TheTVDBClient.java
diff --git a/source/net/sourceforge/filebot/web/TheTVDBSearchResult.java b/source/net/filebot/web/TheTVDBSearchResult.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/TheTVDBSearchResult.java
rename to source/net/filebot/web/TheTVDBSearchResult.java
diff --git a/source/net/sourceforge/filebot/web/VideoHashSubtitleService.java b/source/net/filebot/web/VideoHashSubtitleService.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/VideoHashSubtitleService.java
rename to source/net/filebot/web/VideoHashSubtitleService.java
diff --git a/source/net/sourceforge/filebot/web/WebRequest.java b/source/net/filebot/web/WebRequest.java
similarity index 100%
rename from source/net/sourceforge/filebot/web/WebRequest.java
rename to source/net/filebot/web/WebRequest.java
diff --git a/test/net/sourceforge/filebot/AllTests.java b/test/net/filebot/AllTests.java
similarity index 100%
rename from test/net/sourceforge/filebot/AllTests.java
rename to test/net/filebot/AllTests.java
diff --git a/test/net/sourceforge/filebot/format/ExpressionFormatTest.java b/test/net/filebot/format/ExpressionFormatTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/format/ExpressionFormatTest.java
rename to test/net/filebot/format/ExpressionFormatTest.java
diff --git a/test/net/sourceforge/filebot/hash/VerificationFormatTest.java b/test/net/filebot/hash/VerificationFormatTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/hash/VerificationFormatTest.java
rename to test/net/filebot/hash/VerificationFormatTest.java
diff --git a/test/net/sourceforge/filebot/media/ReleaseInfoTest.java b/test/net/filebot/media/ReleaseInfoTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/media/ReleaseInfoTest.java
rename to test/net/filebot/media/ReleaseInfoTest.java
diff --git a/test/net/sourceforge/filebot/similarity/DateMetricTest.java b/test/net/filebot/similarity/DateMetricTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/similarity/DateMetricTest.java
rename to test/net/filebot/similarity/DateMetricTest.java
diff --git a/test/net/sourceforge/filebot/similarity/EpisodeMetricsTest.java b/test/net/filebot/similarity/EpisodeMetricsTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/similarity/EpisodeMetricsTest.java
rename to test/net/filebot/similarity/EpisodeMetricsTest.java
diff --git a/test/net/sourceforge/filebot/similarity/NameSimilarityMetricTest.java b/test/net/filebot/similarity/NameSimilarityMetricTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/similarity/NameSimilarityMetricTest.java
rename to test/net/filebot/similarity/NameSimilarityMetricTest.java
diff --git a/test/net/sourceforge/filebot/similarity/NumericSimilarityMetricTest.java b/test/net/filebot/similarity/NumericSimilarityMetricTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/similarity/NumericSimilarityMetricTest.java
rename to test/net/filebot/similarity/NumericSimilarityMetricTest.java
diff --git a/test/net/sourceforge/filebot/similarity/SeasonEpisodeMatcherTest.java b/test/net/filebot/similarity/SeasonEpisodeMatcherTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/similarity/SeasonEpisodeMatcherTest.java
rename to test/net/filebot/similarity/SeasonEpisodeMatcherTest.java
diff --git a/test/net/sourceforge/filebot/similarity/SeasonEpisodeMetricTest.java b/test/net/filebot/similarity/SeasonEpisodeMetricTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/similarity/SeasonEpisodeMetricTest.java
rename to test/net/filebot/similarity/SeasonEpisodeMetricTest.java
diff --git a/test/net/sourceforge/filebot/similarity/SeriesNameMatcherTest.java b/test/net/filebot/similarity/SeriesNameMatcherTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/similarity/SeriesNameMatcherTest.java
rename to test/net/filebot/similarity/SeriesNameMatcherTest.java
diff --git a/test/net/sourceforge/filebot/similarity/SimilarityTestSuite.java b/test/net/filebot/similarity/SimilarityTestSuite.java
similarity index 100%
rename from test/net/sourceforge/filebot/similarity/SimilarityTestSuite.java
rename to test/net/filebot/similarity/SimilarityTestSuite.java
diff --git a/test/net/sourceforge/filebot/subtitle/MicroDVDReaderTest.java b/test/net/filebot/subtitle/MicroDVDReaderTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/subtitle/MicroDVDReaderTest.java
rename to test/net/filebot/subtitle/MicroDVDReaderTest.java
diff --git a/test/net/sourceforge/filebot/subtitle/SubRipReaderTest.java b/test/net/filebot/subtitle/SubRipReaderTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/subtitle/SubRipReaderTest.java
rename to test/net/filebot/subtitle/SubRipReaderTest.java
diff --git a/test/net/sourceforge/filebot/subtitle/SubtitleReaderTestSuite.java b/test/net/filebot/subtitle/SubtitleReaderTestSuite.java
similarity index 100%
rename from test/net/sourceforge/filebot/subtitle/SubtitleReaderTestSuite.java
rename to test/net/filebot/subtitle/SubtitleReaderTestSuite.java
diff --git a/test/net/sourceforge/filebot/ui/rename/MatchModelTest.java b/test/net/filebot/ui/rename/MatchModelTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/ui/rename/MatchModelTest.java
rename to test/net/filebot/ui/rename/MatchModelTest.java
diff --git a/test/net/sourceforge/filebot/util/ByteBufferOutputStreamTest.java b/test/net/filebot/util/ByteBufferOutputStreamTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/util/ByteBufferOutputStreamTest.java
rename to test/net/filebot/util/ByteBufferOutputStreamTest.java
diff --git a/test/net/sourceforge/filebot/util/FileUtilitiesTest.java b/test/net/filebot/util/FileUtilitiesTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/util/FileUtilitiesTest.java
rename to test/net/filebot/util/FileUtilitiesTest.java
diff --git a/test/net/sourceforge/filebot/util/FilterIteratorTest.java b/test/net/filebot/util/FilterIteratorTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/util/FilterIteratorTest.java
rename to test/net/filebot/util/FilterIteratorTest.java
diff --git a/test/net/sourceforge/filebot/util/PreferencesListTest.java b/test/net/filebot/util/PreferencesListTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/util/PreferencesListTest.java
rename to test/net/filebot/util/PreferencesListTest.java
diff --git a/test/net/sourceforge/filebot/util/PreferencesMapTest.java b/test/net/filebot/util/PreferencesMapTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/util/PreferencesMapTest.java
rename to test/net/filebot/util/PreferencesMapTest.java
diff --git a/test/net/sourceforge/filebot/util/TestUtil.java b/test/net/filebot/util/TestUtil.java
similarity index 100%
rename from test/net/sourceforge/filebot/util/TestUtil.java
rename to test/net/filebot/util/TestUtil.java
diff --git a/test/net/sourceforge/filebot/util/TreeIteratorTest.java b/test/net/filebot/util/TreeIteratorTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/util/TreeIteratorTest.java
rename to test/net/filebot/util/TreeIteratorTest.java
diff --git a/test/net/sourceforge/filebot/util/UtilTestSuite.java b/test/net/filebot/util/UtilTestSuite.java
similarity index 100%
rename from test/net/sourceforge/filebot/util/UtilTestSuite.java
rename to test/net/filebot/util/UtilTestSuite.java
diff --git a/test/net/sourceforge/filebot/web/AnidbClientTest.java b/test/net/filebot/web/AnidbClientTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/web/AnidbClientTest.java
rename to test/net/filebot/web/AnidbClientTest.java
diff --git a/test/net/sourceforge/filebot/web/IMDbClientTest.java b/test/net/filebot/web/IMDbClientTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/web/IMDbClientTest.java
rename to test/net/filebot/web/IMDbClientTest.java
diff --git a/test/net/sourceforge/filebot/web/OpenSubtitlesHasherTest.java b/test/net/filebot/web/OpenSubtitlesHasherTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/web/OpenSubtitlesHasherTest.java
rename to test/net/filebot/web/OpenSubtitlesHasherTest.java
diff --git a/test/net/sourceforge/filebot/web/OpenSubtitlesXmlRpcTest.java b/test/net/filebot/web/OpenSubtitlesXmlRpcTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/web/OpenSubtitlesXmlRpcTest.java
rename to test/net/filebot/web/OpenSubtitlesXmlRpcTest.java
diff --git a/test/net/sourceforge/filebot/web/SerienjunkiesClientTest.java b/test/net/filebot/web/SerienjunkiesClientTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/web/SerienjunkiesClientTest.java
rename to test/net/filebot/web/SerienjunkiesClientTest.java
diff --git a/test/net/sourceforge/filebot/web/TMDbClientTest.java b/test/net/filebot/web/TMDbClientTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/web/TMDbClientTest.java
rename to test/net/filebot/web/TMDbClientTest.java
diff --git a/test/net/sourceforge/filebot/web/TVRageClientTest.java b/test/net/filebot/web/TVRageClientTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/web/TVRageClientTest.java
rename to test/net/filebot/web/TVRageClientTest.java
diff --git a/test/net/sourceforge/filebot/web/TheTVDBClientTest.java b/test/net/filebot/web/TheTVDBClientTest.java
similarity index 100%
rename from test/net/sourceforge/filebot/web/TheTVDBClientTest.java
rename to test/net/filebot/web/TheTVDBClientTest.java
diff --git a/test/net/sourceforge/filebot/web/WebTestSuite.java b/test/net/filebot/web/WebTestSuite.java
similarity index 100%
rename from test/net/sourceforge/filebot/web/WebTestSuite.java
rename to test/net/filebot/web/WebTestSuite.java