[egit-dev] [EGIT PATCH] Rename org.spearce.egit -> org.eclipse.egit

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[egit-dev] [EGIT PATCH] Rename org.spearce.egit -> org.eclipse.egit
From: "Shawn O. Pearce" <spearce@xxxxxxxxxxx>
Date: Wed, 17 Jun 2009 08:46:16 -0700
Delivered-to: egit-dev@xxxxxxxxxxx
List-archive: <https://dev.eclipse.org/mailman/private/egit-dev>
List-help: <mailto:egit-dev-request@eclipse.org?subject=help>
List-subscribe: <https://dev.eclipse.org/mailman/listinfo/egit-dev>, <mailto:egit-dev-request@eclipse.org?subject=subscribe>
List-unsubscribe: <https://dev.eclipse.org/mailman/listinfo/egit-dev>, <mailto:egit-dev-request@eclipse.org?subject=unsubscribe>
Since we're moving to the Eclipse Foundation we want to use their
package namespace.

Signed-off-by: Shawn O. Pearce <spearce@xxxxxxxxxxx>
---
 EGIT_INSTALL                                       |    6 +-
 README                                             |   22 +-
 .../.project                                       |    2 +-
 .../.settings/org.eclipse.core.resources.prefs     |    0
 .../.settings/org.eclipse.core.runtime.prefs       |    0
 .../build.properties                               |    0
 .../feature.xml                                    |   14 +-
 .../.project                                       |   12 +-
 .../.settings/org.eclipse.core.resources.prefs     |    0
 .../.settings/org.eclipse.core.runtime.prefs       |    0
 .../index.html                                     |    2 +-
 .../site.xml                                       |    2 +-
 .../web/site.css                                   |    0
 .../web/site.xsl                                   |    4 +-
 .../.classpath                                     |    0
 .../.gitignore                                     |    0
 .../.project                                       |    2 +-
 .../.settings/org.eclipse.core.resources.prefs     |    0
 .../.settings/org.eclipse.core.runtime.prefs       |    0
 .../.settings/org.eclipse.jdt.core.prefs           |    0
 .../.settings/org.eclipse.jdt.ui.prefs             |    0
 .../META-INF/MANIFEST.MF                           |   10 +-
 .../build.properties                               |    0
 .../org.eclipse.egit.core--All-Tests.launch        |   10 +-
 .../core/T0003_AdaptableFileTreeIteratorTest.java  |   10 +-
 .../egit/core/internal/mapping/T0002_history.java  |    8 +-
 .../op/T0001_ConnectProviderOperationTest.java     |    5 +-
 .../src/org/eclipse}/egit/core/test/Activator.java |    4 +-
 .../org/eclipse}/egit/core/test/GitTestCase.java   |    2 +-
 .../org/eclipse}/egit/core/test/TestProject.java   |    2 +-
 .../.classpath                                     |    0
 .../.gitignore                                     |    0
 org.eclipse.egit.core/.options                     |    1 +
 .../.project                                       |    2 +-
 .../.settings/org.eclipse.core.resources.prefs     |    0
 .../.settings/org.eclipse.core.runtime.prefs       |    0
 .../.settings/org.eclipse.jdt.core.prefs           |    0
 .../.settings/org.eclipse.jdt.ui.prefs             |    0
 .../LICENSE                                        |    0
 .../META-INF/MANIFEST.MF                           |   14 +-
 .../build.properties                               |    0
 .../plugin.properties                              |    2 +-
 .../plugin.xml                                     |    6 +-
 .../src/org/eclipse}/egit/core/Activator.java      |    6 +-
 .../egit/core/AdaptableFileTreeIterator.java       |    4 +-
 .../eclipse}/egit/core/ContainerTreeIterator.java  |    4 +-
 .../src/org/eclipse}/egit/core/CoreText.java       |    4 +-
 .../egit/core/EclipseGitProgressTransformer.java   |    2 +-
 .../egit/core/GitCorePreferenceInitializer.java    |    2 +-
 .../org/eclipse}/egit/core/GitCorePreferences.java |    2 +-
 .../src/org/eclipse}/egit/core/GitException.java   |    2 +-
 .../org/eclipse}/egit/core/GitMoveDeleteHook.java  |    6 +-
 .../src/org/eclipse}/egit/core/GitProvider.java    |    6 +-
 .../src/org/eclipse}/egit/core/GitTag.java         |    2 +-
 .../src/org/eclipse}/egit/core/ResourceList.java   |    2 +-
 .../src/org/eclipse}/egit/core/coretext.properties |    0
 .../org/eclipse}/egit/core/internal/UpdateJob.java |    8 +-
 .../egit/core/internal/storage/BlobStorage.java    |    2 +-
 .../core/internal/storage/CommitFileRevision.java  |    4 +-
 .../egit/core/internal/storage/GitFileHistory.java |    6 +-
 .../internal/storage/GitFileHistoryProvider.java   |    2 +-
 .../core/internal/storage/GitFileRevision.java     |    2 +-
 .../core/internal/storage/IndexFileRevision.java   |    2 +-
 .../egit/core/internal/storage/KidCommit.java      |    2 +-
 .../egit/core/internal/storage/KidCommitList.java  |    2 +-
 .../egit/core/internal/storage/KidWalk.java        |    2 +-
 .../internal/storage/WorkspaceFileRevision.java    |    2 +-
 .../core/internal/util/ExceptionCollector.java     |    2 +-
 .../egit/core/op/AssumeUnchangedOperation.java     |   10 +-
 .../org/eclipse}/egit/core/op/BranchOperation.java |    2 +-
 .../org/eclipse}/egit/core/op/CloneOperation.java  |    6 +-
 .../egit/core/op/ConnectProviderOperation.java     |   14 +-
 .../egit/core/op/DisconnectProviderOperation.java  |    6 +-
 .../eclipse}/egit/core/op/ListRemoteOperation.java |    4 +-
 .../org/eclipse}/egit/core/op/PushOperation.java   |    6 +-
 .../eclipse}/egit/core/op/PushOperationResult.java |    2 +-
 .../egit/core/op/PushOperationSpecification.java   |    2 +-
 .../org/eclipse}/egit/core/op/ResetOperation.java  |    2 +-
 .../org/eclipse}/egit/core/op/TrackOperation.java  |    8 +-
 .../eclipse}/egit/core/op/UntrackOperation.java    |   10 +-
 .../org/eclipse}/egit/core/op/UpdateOperation.java |    4 +-
 .../eclipse}/egit/core/project/GitProjectData.java |   10 +-
 .../core/project/RepositoryChangeListener.java     |    2 +-
 .../egit/core/project/RepositoryFinder.java        |    4 +-
 .../egit/core/project/RepositoryMapping.java       |    4 +-
 .../.classpath                                     |    0
 .../.gitignore                                     |    0
 org.eclipse.egit.ui/.options                       |    1 +
 .../.project                                       |    2 +-
 .../.settings/org.eclipse.core.resources.prefs     |    0
 .../.settings/org.eclipse.core.runtime.prefs       |    0
 .../.settings/org.eclipse.jdt.core.prefs           |    0
 .../.settings/org.eclipse.jdt.ui.prefs             |    0
 .../LICENSE                                        |    0
 .../META-INF/MANIFEST.MF                           |    6 +-
 .../build.properties                               |    0
 .../icons/checkboxes/disabled_checked.gif          |  Bin 106 -> 106 bytes
 .../icons/checkboxes/disabled_unchecked.gif        |  Bin 96 -> 96 bytes
 .../icons/checkboxes/enabled_checked.gif           |  Bin 874 -> 874 bytes
 .../icons/checkboxes/enabled_unchecked.gif         |  Bin 856 -> 856 bytes
 .../icons/elcl16/add.gif                           |  Bin 318 -> 318 bytes
 .../icons/elcl16/author.gif                        |  Bin 594 -> 594 bytes
 .../icons/elcl16/clear.gif                         |  Bin 595 -> 595 bytes
 .../icons/elcl16/comment.gif                       |  Bin 341 -> 341 bytes
 .../icons/elcl16/commit.gif                        |  Bin 178 -> 178 bytes
 .../icons/elcl16/committer.gif                     |  Bin 589 -> 589 bytes
 .../icons/elcl16/delete.gif                        |  Bin 351 -> 351 bytes
 .../icons/elcl16/filterfolder.gif                  |  Bin 153 -> 153 bytes
 .../icons/elcl16/filterproject.gif                 |  Bin 154 -> 154 bytes
 .../icons/elcl16/filterrepo.gif                    |  Bin 322 -> 322 bytes
 .../icons/elcl16/find.gif                          |  Bin 546 -> 546 bytes
 .../icons/elcl16/next.gif                          |  Bin 353 -> 353 bytes
 .../icons/elcl16/previous.gif                      |  Bin 352 -> 352 bytes
 .../icons/elcl16/trash.gif                         |  Bin 590 -> 590 bytes
 .../icons/etool16/newconnect_wiz.gif               |  Bin 368 -> 368 bytes
 .../icons/obj16/import_obj.gif                     |  Bin 357 -> 357 bytes
 .../icons/ovr/assume_valid.gif                     |  Bin 85 -> 85 bytes
 .../icons/ovr/conflict.gif                         |  Bin 194 -> 194 bytes
 .../icons/ovr/staged.gif                           |  Bin 114 -> 114 bytes
 .../icons/ovr/staged_added.gif                     |  Bin 169 -> 169 bytes
 .../icons/ovr/staged_removed.gif                   |  Bin 176 -> 176 bytes
 .../icons/ovr/untracked.gif                        |  Bin 79 -> 79 bytes
 .../icons/toolbar/checkoutd.png                    |  Bin 412 -> 412 bytes
 .../icons/toolbar/checkoute.png                    |  Bin 419 -> 419 bytes
 .../icons/toolbar/commitd.png                      |  Bin 431 -> 431 bytes
 .../icons/toolbar/commite.png                      |  Bin 435 -> 435 bytes
 .../icons/toolbar/fetchd.png                       |  Bin 359 -> 359 bytes
 .../icons/toolbar/fetche.png                       |  Bin 393 -> 393 bytes
 .../icons/toolbar/pushd.png                        |  Bin 372 -> 372 bytes
 .../icons/toolbar/pushe.png                        |  Bin 404 -> 404 bytes
 .../icons/toolbar/resetd.png                       |  Bin 382 -> 382 bytes
 .../icons/toolbar/resete.png                       |  Bin 408 -> 408 bytes
 .../icons/toolbar/trackd.png                       |  Bin 387 -> 387 bytes
 .../icons/toolbar/tracke.png                       |  Bin 411 -> 411 bytes
 .../icons/wizban/import_wiz.png                    |  Bin 6461 -> 6461 bytes
 .../icons/wizban/newconnect_wizban.png             |  Bin 4918 -> 4918 bytes
 .../plugin.properties                              |    2 +-
 .../plugin.xml                                     |  208 ++++++++++----------
 .../src/org/eclipse}/egit/ui/Activator.java        |    6 +-
 .../org/eclipse}/egit/ui/EclipseAuthenticator.java |    2 +-
 .../org/eclipse}/egit/ui/EclipseProxySelector.java |    2 +-
 .../eclipse}/egit/ui/EclipseSshSessionFactory.java |    2 +-
 .../org/eclipse}/egit/ui/GitHistoryPageSource.java |    6 +-
 .../egit/ui/PluginPreferenceInitializer.java       |    2 +-
 .../src/org/eclipse}/egit/ui/UIIcons.java          |    2 +-
 .../src/org/eclipse}/egit/ui/UIPreferences.java    |    8 +-
 .../src/org/eclipse}/egit/ui/UIText.java           |    4 +-
 .../egit/ui/internal/EditableRevision.java         |    2 +-
 .../GitCompareFileRevisionEditorInput.java         |    4 +-
 .../eclipse}/egit/ui/internal/GitResourceNode.java |    2 +-
 .../org/eclipse}/egit/ui/internal/SWTUtils.java    |    2 +-
 .../internal/actions/AbstractOperationAction.java  |    6 +-
 .../internal/actions/AbstractRevObjectAction.java  |    4 +-
 .../actions/AbstractRevObjectOperation.java        |    2 +-
 .../egit/ui/internal/actions/AssumeUnchanged.java  |    4 +-
 .../egit/ui/internal/actions/BranchAction.java     |    8 +-
 .../egit/ui/internal/actions/CommitAction.java     |    8 +-
 .../internal/actions/CompareWithIndexAction.java   |   10 +-
 .../actions/CompareWithRevisionAction.java         |    2 +-
 .../egit/ui/internal/actions/Disconnect.java       |    6 +-
 .../egit/ui/internal/actions/FetchAction.java      |    8 +-
 .../actions/HardResetToRevisionAction.java         |    4 +-
 .../actions/MixedResetToRevisionAction.java        |    4 +-
 .../egit/ui/internal/actions/PushAction.java       |    8 +-
 .../actions/QuickdiffBaselineOperation.java        |    6 +-
 .../egit/ui/internal/actions/RepositoryAction.java |    4 +-
 .../egit/ui/internal/actions/ResetAction.java      |   10 +-
 .../actions/ResetQuickdiffBaselineAction.java      |    2 +-
 .../ResetQuickdiffBaselineHeadParentAction.java    |    2 +-
 .../actions/SetQuickdiffBaselineAction.java        |    2 +-
 .../actions/ShowResourceInHistoryAction.java       |    4 +-
 .../actions/SoftResetToRevisionAction.java         |    4 +-
 .../eclipse}/egit/ui/internal/actions/Track.java   |    4 +-
 .../eclipse}/egit/ui/internal/actions/Untrack.java |    4 +-
 .../eclipse}/egit/ui/internal/actions/Update.java  |    4 +-
 .../ui/internal/clone/CloneDestinationPage.java    |   10 +-
 .../egit/ui/internal/clone/GitCloneWizard.java     |   12 +-
 .../ui/internal/clone/GitProjectsImportPage.java   |    8 +-
 .../egit/ui/internal/clone/SourceBranchPage.java   |   16 +-
 .../ui/internal/components/BaseWizardPage.java     |    2 +-
 .../components/CenteredImageLabelProvider.java     |    2 +-
 .../internal/components/CheckboxLabelProvider.java |    4 +-
 .../internal/components/ClickableCellEditor.java   |    2 +-
 .../internal/components/ComboLabelingSupport.java  |    2 +-
 .../ui/internal/components/RefContentProposal.java |    4 +-
 .../egit/ui/internal/components/RefSpecPage.java   |    8 +-
 .../egit/ui/internal/components/RefSpecPanel.java  |    8 +-
 .../internal/components/RepositorySelection.java   |    2 +-
 .../components/RepositorySelectionPage.java        |    6 +-
 .../components/SelectionChangeListener.java        |    2 +-
 .../decorators/DecoratableResourceAdapter.java     |   14 +-
 .../egit/ui/internal/decorators/GitDocument.java   |    8 +-
 .../decorators/GitLightweightDecorator.java        |   26 ++--
 .../internal/decorators/GitQuickDiffProvider.java  |    6 +-
 .../internal/decorators/IDecoratableResource.java  |    2 +-
 .../ui/internal/dialogs/BranchSelectionDialog.java |    8 +-
 .../egit/ui/internal/dialogs/CommitDialog.java     |   14 +-
 .../ui/internal/factories/GitAdapterFactory.java   |    4 +-
 .../egit/ui/internal/fetch/FetchResultDialog.java  |    4 +-
 .../egit/ui/internal/fetch/FetchResultTable.java   |    4 +-
 .../egit/ui/internal/fetch/FetchWizard.java        |   18 +-
 .../fetch/TrackingRefUpdateContentProvider.java    |    2 +-
 .../ui/internal/history/CommitFileDiffViewer.java  |    8 +-
 .../egit/ui/internal/history/CommitGraphTable.java |    8 +-
 .../ui/internal/history/CommitMessageViewer.java   |    6 +-
 .../internal/history/CommitNavigationListener.java |    2 +-
 .../egit/ui/internal/history/FileDiff.java         |    2 +-
 .../internal/history/FileDiffContentProvider.java  |    4 +-
 .../ui/internal/history/FileDiffLabelProvider.java |    2 +-
 .../egit/ui/internal/history/FindResults.java      |    2 +-
 .../egit/ui/internal/history/FindToolbar.java      |   10 +-
 .../ui/internal/history/FindToolbarThread.java     |    2 +-
 .../ui/internal/history/GenerateHistoryJob.java    |    6 +-
 .../egit/ui/internal/history/GitHistoryPage.java   |   18 +-
 .../ui/internal/history/GraphContentProvider.java  |    2 +-
 .../ui/internal/history/GraphLabelProvider.java    |    2 +-
 .../history/RevObjectSelectionProvider.java        |    2 +-
 .../egit/ui/internal/history/SWTCommit.java        |    2 +-
 .../egit/ui/internal/history/SWTCommitList.java    |    2 +-
 .../egit/ui/internal/history/SWTPlotRenderer.java  |    4 +-
 .../eclipse}/egit/ui/internal/history/SWTWalk.java |    2 +-
 .../preferences/GitDecoratorPreferencePage.java    |   16 +-
 .../ui/internal/preferences/GitPreferenceRoot.java |    4 +-
 .../preferences/GitProjectPropertyPage.java        |    6 +-
 .../preferences/HistoryPreferencePage.java         |    8 +-
 .../preferences/StorageSizeFieldEditor.java        |    2 +-
 .../preferences/WindowCachePreferencePage.java     |   10 +-
 .../egit/ui/internal/push/ConfirmationPage.java    |   20 +-
 .../egit/ui/internal/push/PushResultDialog.java    |    6 +-
 .../egit/ui/internal/push/PushResultTable.java     |   10 +-
 .../eclipse}/egit/ui/internal/push/PushWizard.java |   20 +-
 .../ui/internal/push/RefUpdateContentProvider.java |    4 +-
 .../egit/ui/internal/push/RefUpdateElement.java    |    4 +-
 .../ui/internal/sharing/ExistingOrNewPage.java     |   12 +-
 .../egit/ui/internal/sharing/SharingWizard.java    |    8 +-
 .../src/org/eclipse}/egit/ui/uitext.properties     |    0
 {org.spearce.egit => org.eclipse.egit}/.classpath  |    0
 {org.spearce.egit => org.eclipse.egit}/.project    |    2 +-
 .../.settings/org.eclipse.core.resources.prefs     |    0
 .../.settings/org.eclipse.core.runtime.prefs       |    0
 .../.settings/org.eclipse.jdt.core.prefs           |    0
 .../META-INF/MANIFEST.MF                           |    4 +-
 {org.spearce.egit => org.eclipse.egit}/about.ini   |    0
 .../build.properties                               |    0
 {org.spearce.egit => org.eclipse.egit}/egit.png    |  Bin 1366 -> 1366 bytes
 {org.spearce.egit => org.eclipse.egit}/egit.svg    |  Bin 34668 -> 34668 bytes
 org.spearce.egit.core/.options                     |    1 -
 org.spearce.egit.ui/.options                       |    1 -
 tag_egit.sh                                        |    4 +-
 249 files changed, 565 insertions(+), 560 deletions(-)
 rename {org.spearce.egit-feature => org.eclipse.egit-feature}/.project (89%)
 rename {org.spearce.egit-feature => org.eclipse.egit-feature}/.settings/org.eclipse.core.resources.prefs (100%)
 rename {org.spearce.egit-feature => org.eclipse.egit-feature}/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {org.spearce.egit-feature => org.eclipse.egit-feature}/build.properties (100%)
 rename {org.spearce.egit-feature => org.eclipse.egit-feature}/feature.xml (98%)
 rename {org.spearce.egit-updatesite => org.eclipse.egit-updatesite}/.project (59%)
 rename {org.spearce.egit-updatesite => org.eclipse.egit-updatesite}/.settings/org.eclipse.core.resources.prefs (100%)
 rename {org.spearce.egit-updatesite => org.eclipse.egit-updatesite}/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {org.spearce.egit-updatesite => org.eclipse.egit-updatesite}/index.html (97%)
 rename {org.spearce.egit-updatesite => org.eclipse.egit-updatesite}/site.xml (78%)
 rename {org.spearce.egit-updatesite => org.eclipse.egit-updatesite}/web/site.css (100%)
 rename {org.spearce.egit-updatesite => org.eclipse.egit-updatesite}/web/site.xsl (98%)
 rename {org.spearce.egit.core.test => org.eclipse.egit.core.test}/.classpath (100%)
 rename {org.spearce.egit.core.test => org.eclipse.egit.core.test}/.gitignore (100%)
 rename {org.spearce.egit.core.test => org.eclipse.egit.core.test}/.project (93%)
 rename {org.spearce.egit.core.test => org.eclipse.egit.core.test}/.settings/org.eclipse.core.resources.prefs (100%)
 rename {org.spearce.egit.core.test => org.eclipse.egit.core.test}/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {org.spearce.egit.core.test => org.eclipse.egit.core.test}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {org.spearce.egit.core.test => org.eclipse.egit.core.test}/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {org.spearce.egit.core.test => org.eclipse.egit.core.test}/META-INF/MANIFEST.MF (67%)
 rename {org.spearce.egit.core.test => org.eclipse.egit.core.test}/build.properties (100%)
 rename org.spearce.egit.core.test/org.spearce.egit.core--All-Tests.launch => org.eclipse.egit.core.test/org.eclipse.egit.core--All-Tests.launch (90%)
 rename {org.spearce.egit.core.test/src/org/spearce => org.eclipse.egit.core.test/src/org/eclipse}/egit/core/T0003_AdaptableFileTreeIteratorTest.java (88%)
 rename {org.spearce.egit.core.test/src/org/spearce => org.eclipse.egit.core.test/src/org/eclipse}/egit/core/internal/mapping/T0002_history.java (95%)
 rename {org.spearce.egit.core.test/src/org/spearce => org.eclipse.egit.core.test/src/org/eclipse}/egit/core/op/T0001_ConnectProviderOperationTest.java (96%)
 rename {org.spearce.egit.core.test/src/org/spearce => org.eclipse.egit.core.test/src/org/eclipse}/egit/core/test/Activator.java (93%)
 rename {org.spearce.egit.core.test/src/org/spearce => org.eclipse.egit.core.test/src/org/eclipse}/egit/core/test/GitTestCase.java (97%)
 rename {org.spearce.egit.core.test/src/org/spearce => org.eclipse.egit.core.test/src/org/eclipse}/egit/core/test/TestProject.java (99%)
 rename {org.spearce.egit.core => org.eclipse.egit.core}/.classpath (100%)
 rename {org.spearce.egit.core => org.eclipse.egit.core}/.gitignore (100%)
 create mode 100644 org.eclipse.egit.core/.options
 rename {org.spearce.egit.core => org.eclipse.egit.core}/.project (94%)
 rename {org.spearce.egit.core => org.eclipse.egit.core}/.settings/org.eclipse.core.resources.prefs (100%)
 rename {org.spearce.egit.core => org.eclipse.egit.core}/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {org.spearce.egit.core => org.eclipse.egit.core}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {org.spearce.egit.core => org.eclipse.egit.core}/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {org.spearce.egit.core => org.eclipse.egit.core}/LICENSE (100%)
 rename {org.spearce.egit.core => org.eclipse.egit.core}/META-INF/MANIFEST.MF (55%)
 rename {org.spearce.egit.core => org.eclipse.egit.core}/build.properties (100%)
 rename {org.spearce.egit.core => org.eclipse.egit.core}/plugin.properties (58%)
 rename {org.spearce.egit.core => org.eclipse.egit.core}/plugin.xml (73%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/Activator.java (95%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/AdaptableFileTreeIterator.java (97%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/ContainerTreeIterator.java (98%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/CoreText.java (96%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/EclipseGitProgressTransformer.java (98%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/GitCorePreferenceInitializer.java (97%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/GitCorePreferences.java (96%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/GitException.java (99%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/GitMoveDeleteHook.java (98%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/GitProvider.java (94%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/GitTag.java (96%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/ResourceList.java (97%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/coretext.properties (100%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/internal/UpdateJob.java (96%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/internal/storage/BlobStorage.java (98%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/internal/storage/CommitFileRevision.java (97%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/internal/storage/GitFileHistory.java (97%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/internal/storage/GitFileHistoryProvider.java (96%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/internal/storage/GitFileRevision.java (98%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/internal/storage/IndexFileRevision.java (98%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/internal/storage/KidCommit.java (95%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/internal/storage/KidCommitList.java (94%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/internal/storage/KidWalk.java (94%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/internal/storage/WorkspaceFileRevision.java (97%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/internal/util/ExceptionCollector.java (98%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/op/AssumeUnchangedOperation.java (94%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/op/BranchOperation.java (99%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/op/CloneOperation.java (98%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/op/ConnectProviderOperation.java (90%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/op/DisconnectProviderOperation.java (95%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/op/ListRemoteOperation.java (97%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/op/PushOperation.java (97%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/op/PushOperationResult.java (99%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/op/PushOperationSpecification.java (98%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/op/ResetOperation.java (99%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/op/TrackOperation.java (96%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/op/UntrackOperation.java (94%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/op/UpdateOperation.java (94%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/project/GitProjectData.java (98%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/project/RepositoryChangeListener.java (96%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/project/RepositoryFinder.java (98%)
 rename {org.spearce.egit.core/src/org/spearce => org.eclipse.egit.core/src/org/eclipse}/egit/core/project/RepositoryMapping.java (98%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/.classpath (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/.gitignore (100%)
 create mode 100644 org.eclipse.egit.ui/.options
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/.project (95%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/.settings/org.eclipse.core.resources.prefs (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/LICENSE (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/META-INF/MANIFEST.MF (84%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/build.properties (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/checkboxes/disabled_checked.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/checkboxes/disabled_unchecked.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/checkboxes/enabled_checked.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/checkboxes/enabled_unchecked.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/elcl16/add.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/elcl16/author.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/elcl16/clear.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/elcl16/comment.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/elcl16/commit.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/elcl16/committer.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/elcl16/delete.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/elcl16/filterfolder.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/elcl16/filterproject.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/elcl16/filterrepo.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/elcl16/find.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/elcl16/next.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/elcl16/previous.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/elcl16/trash.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/etool16/newconnect_wiz.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/obj16/import_obj.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/ovr/assume_valid.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/ovr/conflict.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/ovr/staged.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/ovr/staged_added.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/ovr/staged_removed.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/ovr/untracked.gif (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/toolbar/checkoutd.png (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/toolbar/checkoute.png (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/toolbar/commitd.png (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/toolbar/commite.png (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/toolbar/fetchd.png (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/toolbar/fetche.png (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/toolbar/pushd.png (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/toolbar/pushe.png (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/toolbar/resetd.png (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/toolbar/resete.png (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/toolbar/trackd.png (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/toolbar/tracke.png (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/wizban/import_wiz.png (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/icons/wizban/newconnect_wizban.png (100%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/plugin.properties (98%)
 rename {org.spearce.egit.ui => org.eclipse.egit.ui}/plugin.xml (61%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/Activator.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/EclipseAuthenticator.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/EclipseProxySelector.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/EclipseSshSessionFactory.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/GitHistoryPageSource.java (90%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/PluginPreferenceInitializer.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/UIIcons.java (99%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/UIPreferences.java (94%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/UIText.java (99%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/EditableRevision.java (99%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/GitCompareFileRevisionEditorInput.java (99%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/GitResourceNode.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/SWTUtils.java (99%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/AbstractOperationAction.java (96%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/AbstractRevObjectAction.java (89%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/AbstractRevObjectOperation.java (94%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/AssumeUnchanged.java (90%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/BranchAction.java (91%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/CommitAction.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/CompareWithIndexAction.java (93%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/CompareWithRevisionAction.java (97%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/Disconnect.java (85%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/FetchAction.java (90%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/HardResetToRevisionAction.java (90%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/MixedResetToRevisionAction.java (90%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/PushAction.java (89%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/QuickdiffBaselineOperation.java (89%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/RepositoryAction.java (97%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/ResetAction.java (90%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/ResetQuickdiffBaselineAction.java (95%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/ResetQuickdiffBaselineHeadParentAction.java (95%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/SetQuickdiffBaselineAction.java (95%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/ShowResourceInHistoryAction.java (94%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/SoftResetToRevisionAction.java (90%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/Track.java (95%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/Untrack.java (91%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/actions/Update.java (90%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/clone/CloneDestinationPage.java (97%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/clone/GitCloneWizard.java (95%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/clone/GitProjectsImportPage.java (99%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/clone/SourceBranchPage.java (95%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/components/BaseWizardPage.java (97%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/components/CenteredImageLabelProvider.java (97%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/components/CheckboxLabelProvider.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/components/ClickableCellEditor.java (97%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/components/ComboLabelingSupport.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/components/RefContentProposal.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/components/RefSpecPage.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/components/RefSpecPanel.java (99%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/components/RepositorySelection.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/components/RepositorySelectionPage.java (99%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/components/SelectionChangeListener.java (93%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/decorators/DecoratableResourceAdapter.java (96%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/decorators/GitDocument.java (97%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/decorators/GitLightweightDecorator.java (96%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/decorators/GitQuickDiffProvider.java (95%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/decorators/IDecoratableResource.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/dialogs/BranchSelectionDialog.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/dialogs/CommitDialog.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/factories/GitAdapterFactory.java (92%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/fetch/FetchResultDialog.java (96%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/fetch/FetchResultTable.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/fetch/FetchWizard.java (92%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/fetch/TrackingRefUpdateContentProvider.java (96%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/history/CommitFileDiffViewer.java (95%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/history/CommitGraphTable.java (97%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/history/CommitMessageViewer.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/history/CommitNavigationListener.java (93%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/history/FileDiff.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/history/FileDiffContentProvider.java (94%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/history/FileDiffLabelProvider.java (95%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/history/FindResults.java (99%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/history/FindToolbar.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/history/FindToolbarThread.java (99%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/history/GenerateHistoryJob.java (94%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/history/GitHistoryPage.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/history/GraphContentProvider.java (95%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/history/GraphLabelProvider.java (97%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/history/RevObjectSelectionProvider.java (97%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/history/SWTCommit.java (94%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/history/SWTCommitList.java (97%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/history/SWTPlotRenderer.java (97%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/history/SWTWalk.java (94%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/preferences/GitDecoratorPreferencePage.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/preferences/GitPreferenceRoot.java (93%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/preferences/GitProjectPropertyPage.java (96%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/preferences/HistoryPreferencePage.java (90%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/preferences/StorageSizeFieldEditor.java (98%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/preferences/WindowCachePreferencePage.java (90%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/push/ConfirmationPage.java (92%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/push/PushResultDialog.java (94%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/push/PushResultTable.java (97%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/push/PushWizard.java (93%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/push/RefUpdateContentProvider.java (95%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/push/RefUpdateElement.java (94%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/sharing/ExistingOrNewPage.java (96%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/internal/sharing/SharingWizard.java (94%)
 rename {org.spearce.egit.ui/src/org/spearce => org.eclipse.egit.ui/src/org/eclipse}/egit/ui/uitext.properties (100%)
 rename {org.spearce.egit => org.eclipse.egit}/.classpath (100%)
 rename {org.spearce.egit => org.eclipse.egit}/.project (95%)
 rename {org.spearce.egit => org.eclipse.egit}/.settings/org.eclipse.core.resources.prefs (100%)
 rename {org.spearce.egit => org.eclipse.egit}/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {org.spearce.egit => org.eclipse.egit}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {org.spearce.egit => org.eclipse.egit}/META-INF/MANIFEST.MF (69%)
 rename {org.spearce.egit => org.eclipse.egit}/about.ini (100%)
 rename {org.spearce.egit => org.eclipse.egit}/build.properties (100%)
 rename {org.spearce.egit => org.eclipse.egit}/egit.png (100%)
 rename {org.spearce.egit => org.eclipse.egit}/egit.svg (97%)
 delete mode 100644 org.spearce.egit.core/.options
 delete mode 100644 org.spearce.egit.ui/.options

diff --git a/EGIT_INSTALL b/EGIT_INSTALL
index 3a8f249..81d0ada 100644
--- a/EGIT_INSTALL
+++ b/EGIT_INSTALL
@@ -21,7 +21,7 @@ things.
 
 INSTALLATION INSTRUCTIONS
 
-- Delete any old versions of the plugin in the <eclipse-path>/plugins/org.spearce.*
+- Delete any old versions of the plugin in the <eclipse-path>/plugins/org.eclipse.egit.*
 - Start eclipse
 - Make sure a recent JDK 1.5.0_11 or JDK 1.6.x is among your installed JRE's. Which
   one is the default should not matter but Java 6 is recommended. 
@@ -29,7 +29,7 @@ INSTALLATION INSTRUCTIONS
 - Now you can either export the plugin to a set of jar files to use in an Eclipse 
   installation or run it from within Eclipse. The latter is for development and 
   tracking down bugs.
-- Export the plugin by selecting the org.spearce.* packages in package
+- Export the plugin by selecting the org.eclipse.egit.* packages in package
   explorer and choosing File/Export. Then select Deployable plug-ins and 
   fragments and choose the Next button. Set Directory to the top of your
   installation directory (NOT the plugins directory). Select Finish. After 
@@ -37,7 +37,7 @@ INSTALLATION INSTRUCTIONS
   Team>Share menu in the context menu when a project is selected.
 
 DEBUGGING INSTRUCTIONS
-- Select the org.spearce.egit.ui project, and using the context menu select
+- Select the org.eclipse.egit.ui project, and using the context menu select
   Run As(or Debug As) / Eclipse Application. Make sure the application runs
   using JDK 1.6 (or JDK1.5.0_11 or newer) if you have any problems.
 
diff --git a/README b/README
index 26fc865..d54bf40 100644
--- a/README
+++ b/README
@@ -6,41 +6,41 @@ and LICENSE files for the complete licenses within each package.
 This package is actually composed of three major components plus
 three for packaging.
 
-  org.spearce.egit.core/
+  org.eclipse.egit.core/
 
-    An Eclipse plugin providing an interface to org.spearce.jgit
+    An Eclipse plugin providing an interface to org.eclipse.jgit
     and support routines to allow processing against the Eclipse
     workspace and resource APIs, rather than the standard Java
     file APIs.  It also supplies the team provider implementation.
     Everything here is EPL.
 
-  org.spearce.egit.ui/
+  org.eclipse.egit.ui/
 
     An Eclipse plugin providing the user interface on top of
-    org.spearce.egit.core.
+    org.eclipse.egit.core.
 
     Everything here is EPL.
 
-  org.spearce.egit.core.test/
+  org.eclipse.egit.core.test/
 
-    Unit tests for org.spearce.egit.core.
+    Unit tests for org.eclipse.egit.core.
 
     Everything here is EPL.
 
-  org.spearce.egit/
+  org.eclipse.egit/
 
     A plugin for packaging
 
     Everything here is EPL.
 
-  org.spearce.egit-feature
+  org.eclipse.egit-feature
 
     Also packaging. This project is for building an Eclipse "feature"
     out of the plugins above.
 
     Everything here is EPL.
 
-  org.spearce.egit-updatesite/
+  org.eclipse.egit-updatesite/
 
     This package is for producing and update site, i.e. a web site
     you can point your eclipse at and just upgrade.
@@ -77,7 +77,7 @@ three for packaging.
 
             == Package Features                ==
 
-  org.spearce.egit.core/
+  org.eclipse.egit.core/
 
     * Supplies an Eclipse team provider.
 
@@ -94,7 +94,7 @@ three for packaging.
 
     * Resolves through linked containers.
 
-  org.spearce.egit.ui/
+  org.eclipse.egit.ui/
 
     * Connect team provider wizard panels.
 
diff --git a/org.spearce.egit-feature/.project b/org.eclipse.egit-feature/.project
similarity index 89%
rename from org.spearce.egit-feature/.project
rename to org.eclipse.egit-feature/.project
index dac8f65..1064bb0 100644
--- a/org.spearce.egit-feature/.project
+++ b/org.eclipse.egit-feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.spearce.egit-feature</name>
+	<name>org.eclipse.egit-feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.spearce.egit-feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.egit-feature/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.spearce.egit-feature/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.egit-feature/.settings/org.eclipse.core.resources.prefs
diff --git a/org.spearce.egit-feature/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.egit-feature/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from org.spearce.egit-feature/.settings/org.eclipse.core.runtime.prefs
rename to org.eclipse.egit-feature/.settings/org.eclipse.core.runtime.prefs
diff --git a/org.spearce.egit-feature/build.properties b/org.eclipse.egit-feature/build.properties
similarity index 100%
rename from org.spearce.egit-feature/build.properties
rename to org.eclipse.egit-feature/build.properties
diff --git a/org.spearce.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml
similarity index 98%
rename from org.spearce.egit-feature/feature.xml
rename to org.eclipse.egit-feature/feature.xml
index 1fcda7b..3e21cbd 100644
--- a/org.spearce.egit-feature/feature.xml
+++ b/org.eclipse.egit-feature/feature.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.spearce.egit"
+      id="org.eclipse.egit"
       label="Eclipse Git Feature"
       version="0.4.0.qualifier"
-      provider-name="spearce.org"
-      plugin="org.spearce.egit">
+      provider-name="eclipse.org"
+      plugin="org.eclipse.egit">
 
    <description url="http://www.jgit.org";>
 An Eclipse Git Plugin in pure Java.
@@ -21,7 +21,7 @@ Changes on @branch@ since @refversion@:
       This plugin is Copyright it&apos;s authors and contributors. The code
 is available under the BSD license for core Git repository access
 (JGit) and the EPL for Eclipse specific portions plus a BSD style
-license for the SSH protocol (org.spearce.jgit/lib/JSch.LICENSE.txt).
+license for the SSH protocol (JSch).
 See the license agreement for details.
    </copyright>
 
@@ -321,21 +321,21 @@ litigation.
    </requires>
 
    <plugin
-         id="org.spearce.egit.core"
+         id="org.eclipse.egit.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.spearce.egit.ui"
+         id="org.eclipse.egit.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.spearce.egit"
+         id="org.eclipse.egit"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/org.spearce.egit-updatesite/.project b/org.eclipse.egit-updatesite/.project
similarity index 59%
rename from org.spearce.egit-updatesite/.project
rename to org.eclipse.egit-updatesite/.project
index 857cfe6..2304edf 100644
--- a/org.spearce.egit-updatesite/.project
+++ b/org.eclipse.egit-updatesite/.project
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.spearce.egit-updatesite</name>
+	<name>org.eclipse.egit-updatesite</name>
 	<comment></comment>
 	<projects>
-		<project>org.spearce.egit</project>
-		<project>org.spearce.egit.core</project>
-		<project>org.spearce.egit.core.test</project>
-		<project>org.spearce.egit.ui</project>
-		<project>org.spearce.egit-feature</project>
+		<project>org.eclipse.egit</project>
+		<project>org.eclipse.egit.core</project>
+		<project>org.eclipse.egit.core.test</project>
+		<project>org.eclipse.egit.ui</project>
+		<project>org.eclipse.egit-feature</project>
 		<project>org.spearce.jgit</project>
 	</projects>
 	<buildSpec>
diff --git a/org.spearce.egit-updatesite/.settings/org.eclipse.core.resources.prefs b/org.eclipse.egit-updatesite/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.spearce.egit-updatesite/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.egit-updatesite/.settings/org.eclipse.core.resources.prefs
diff --git a/org.spearce.egit-updatesite/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.egit-updatesite/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from org.spearce.egit-updatesite/.settings/org.eclipse.core.runtime.prefs
rename to org.eclipse.egit-updatesite/.settings/org.eclipse.core.runtime.prefs
diff --git a/org.spearce.egit-updatesite/index.html b/org.eclipse.egit-updatesite/index.html
similarity index 97%
rename from org.spearce.egit-updatesite/index.html
rename to org.eclipse.egit-updatesite/index.html
index bfea558..3153645 100644
--- a/org.spearce.egit-updatesite/index.html
+++ b/org.eclipse.egit-updatesite/index.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>org.spearce.egit-updatesite</title>
+<title>org.eclipse.egit-updatesite</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <style>@import url("web/site.css");</style>
 <script type="text/javascript">
diff --git a/org.spearce.egit-updatesite/site.xml b/org.eclipse.egit-updatesite/site.xml
similarity index 78%
rename from org.spearce.egit-updatesite/site.xml
rename to org.eclipse.egit-updatesite/site.xml
index ac1c32f..7fcb229 100644
--- a/org.spearce.egit-updatesite/site.xml
+++ b/org.eclipse.egit-updatesite/site.xml
@@ -3,7 +3,7 @@
    <description url="Eclipse Git Plugin">
       This is a pure Java implementation of the Git version control system. The native Git version is also required in this version,
    </description>
-   <feature url="features/org.spearce.egit_0.4.0.qualifier.jar" id="org.spearce.egit" version="0.4.0.qualifier" patch="true">
+   <feature url="features/org.eclipse.egit_0.4.0.qualifier.jar" id="org.eclipse.egit" version="0.4.0.qualifier" patch="true">
       <category name="Eclipse Git Plugin"/>
    </feature>
    <category-def name="Eclipse Git Plugin" label="Eclipse Git Plugin">
diff --git a/org.spearce.egit-updatesite/web/site.css b/org.eclipse.egit-updatesite/web/site.css
similarity index 100%
rename from org.spearce.egit-updatesite/web/site.css
rename to org.eclipse.egit-updatesite/web/site.css
diff --git a/org.spearce.egit-updatesite/web/site.xsl b/org.eclipse.egit-updatesite/web/site.xsl
similarity index 98%
rename from org.spearce.egit-updatesite/web/site.xsl
rename to org.eclipse.egit-updatesite/web/site.xsl
index 4630385..0620b5c 100644
--- a/org.spearce.egit-updatesite/web/site.xsl
+++ b/org.eclipse.egit-updatesite/web/site.xsl
@@ -5,11 +5,11 @@
 <xsl:for-each select="site">
 	<html>
 	<head>
-	<title>org.spearce.egit-updatesite</title>
+	<title>org.eclipse.egit-updatesite</title>
 	<style>@import url("web/site.css");</style>
 	</head>
 	<body>
-	<h1 class="title">org.spearce.egit-updatesite</h1>
+	<h1 class="title">org.eclipse.egit-updatesite</h1>
 	<p class="bodyText"><xsl:value-of select="description"/></p>
 	<table width="100%" border="0" cellspacing="1" cellpadding="2">
 	<xsl:for-each select="category-def">
diff --git a/org.spearce.egit.core.test/.classpath b/org.eclipse.egit.core.test/.classpath
similarity index 100%
rename from org.spearce.egit.core.test/.classpath
rename to org.eclipse.egit.core.test/.classpath
diff --git a/org.spearce.egit.core.test/.gitignore b/org.eclipse.egit.core.test/.gitignore
similarity index 100%
rename from org.spearce.egit.core.test/.gitignore
rename to org.eclipse.egit.core.test/.gitignore
diff --git a/org.spearce.egit.core.test/.project b/org.eclipse.egit.core.test/.project
similarity index 93%
rename from org.spearce.egit.core.test/.project
rename to org.eclipse.egit.core.test/.project
index 3b7fb2f..36089b8 100644
--- a/org.spearce.egit.core.test/.project
+++ b/org.eclipse.egit.core.test/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.spearce.egit.core.test</name>
+	<name>org.eclipse.egit.core.test</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.spearce.egit.core.test/.settings/org.eclipse.core.resources.prefs b/org.eclipse.egit.core.test/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.spearce.egit.core.test/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.egit.core.test/.settings/org.eclipse.core.resources.prefs
diff --git a/org.spearce.egit.core.test/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.egit.core.test/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from org.spearce.egit.core.test/.settings/org.eclipse.core.runtime.prefs
rename to org.eclipse.egit.core.test/.settings/org.eclipse.core.runtime.prefs
diff --git a/org.spearce.egit.core.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.egit.core.test/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.spearce.egit.core.test/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.egit.core.test/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.spearce.egit.core.test/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.egit.core.test/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from org.spearce.egit.core.test/.settings/org.eclipse.jdt.ui.prefs
rename to org.eclipse.egit.core.test/.settings/org.eclipse.jdt.ui.prefs
diff --git a/org.spearce.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
similarity index 67%
rename from org.spearce.egit.core.test/META-INF/MANIFEST.MF
rename to org.eclipse.egit.core.test/META-INF/MANIFEST.MF
index 310226c..b2a8ed9 100644
--- a/org.spearce.egit.core.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test Plug-in
-Bundle-SymbolicName: org.spearce.egit.core.test
+Bundle-SymbolicName: org.eclipse.egit.core.test
 Bundle-Version: 0.4.0.qualifier
-Bundle-Activator: org.spearce.egit.core.test.Activator
+Bundle-Activator: org.eclipse.egit.core.test.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.team.core,
  org.junit,
- org.spearce.egit.core,
- org.spearce.egit.ui,
+ org.eclipse.egit.core,
+ org.eclipse.egit.ui,
  org.spearce.jgit,
  org.eclipse.core.filesystem
 Bundle-ActivationPolicy: lazy
@@ -16,5 +16,5 @@ Import-Package: org.eclipse.core.resources,
  org.eclipse.jdt.core,
  org.eclipse.jdt.junit,
  org.eclipse.jdt.launching
-Export-Package: org.spearce.egit.core.internal.mapping
+Export-Package: org.eclipse.egit.core.internal.mapping
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.spearce.egit.core.test/build.properties b/org.eclipse.egit.core.test/build.properties
similarity index 100%
rename from org.spearce.egit.core.test/build.properties
rename to org.eclipse.egit.core.test/build.properties
diff --git a/org.spearce.egit.core.test/org.spearce.egit.core--All-Tests.launch b/org.eclipse.egit.core.test/org.eclipse.egit.core--All-Tests.launch
similarity index 90%
rename from org.spearce.egit.core.test/org.spearce.egit.core--All-Tests.launch
rename to org.eclipse.egit.core.test/org.eclipse.egit.core--All-Tests.launch
index cc82f84..10b0eb7 100644
--- a/org.spearce.egit.core.test/org.spearce.egit.core--All-Tests.launch
+++ b/org.eclipse.egit.core.test/org.eclipse.egit.core--All-Tests.launch
@@ -7,31 +7,33 @@
 <stringAttribute key="checked" value="[NONE]"/>
 <booleanAttribute key="clearConfig" value="true"/>
 <booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
 <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.spearce.egit.core.test"/>
+<listEntry value="/org.eclipse.egit.core.test"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.spearce.egit.core.test"/>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.egit.core.test"/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.spearce.egit.core.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.egit.core.test"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
+<booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useDefaultConfig" value="true"/>
 <booleanAttribute key="useDefaultConfigArea" value="false"/>
diff --git a/org.spearce.egit.core.test/src/org/spearce/egit/core/T0003_AdaptableFileTreeIteratorTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/T0003_AdaptableFileTreeIteratorTest.java
similarity index 88%
rename from org.spearce.egit.core.test/src/org/spearce/egit/core/T0003_AdaptableFileTreeIteratorTest.java
rename to org.eclipse.egit.core.test/src/org/eclipse/egit/core/T0003_AdaptableFileTreeIteratorTest.java
index 63e0798..d6d10c2 100644
--- a/org.spearce.egit.core.test/src/org/spearce/egit/core/T0003_AdaptableFileTreeIteratorTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/T0003_AdaptableFileTreeIteratorTest.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core;
+package org.eclipse.egit.core;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -15,9 +15,11 @@
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IWorkspaceRoot;
-import org.spearce.egit.core.op.ConnectProviderOperation;
-import org.spearce.egit.core.project.RepositoryMapping;
-import org.spearce.egit.core.test.GitTestCase;
+import org.eclipse.egit.core.AdaptableFileTreeIterator;
+import org.eclipse.egit.core.ContainerTreeIterator;
+import org.eclipse.egit.core.op.ConnectProviderOperation;
+import org.eclipse.egit.core.project.RepositoryMapping;
+import org.eclipse.egit.core.test.GitTestCase;
 import org.spearce.jgit.lib.Repository;
 import org.spearce.jgit.treewalk.TreeWalk;
 import org.spearce.jgit.treewalk.WorkingTreeIterator;
diff --git a/org.spearce.egit.core.test/src/org/spearce/egit/core/internal/mapping/T0002_history.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/mapping/T0002_history.java
similarity index 95%
rename from org.spearce.egit.core.test/src/org/spearce/egit/core/internal/mapping/T0002_history.java
rename to org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/mapping/T0002_history.java
index 735540e..1e061c5 100644
--- a/org.spearce.egit.core.test/src/org/spearce/egit/core/internal/mapping/T0002_history.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/mapping/T0002_history.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.internal.mapping;
+package org.eclipse.egit.core.internal.mapping;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -15,13 +15,13 @@
 import java.util.TimeZone;
 
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.egit.core.GitProvider;
+import org.eclipse.egit.core.op.ConnectProviderOperation;
+import org.eclipse.egit.core.test.GitTestCase;
 import org.eclipse.team.core.RepositoryProvider;
 import org.eclipse.team.core.history.IFileHistory;
 import org.eclipse.team.core.history.IFileHistoryProvider;
 import org.eclipse.team.core.history.IFileRevision;
-import org.spearce.egit.core.GitProvider;
-import org.spearce.egit.core.op.ConnectProviderOperation;
-import org.spearce.egit.core.test.GitTestCase;
 import org.spearce.jgit.lib.Commit;
 import org.spearce.jgit.lib.FileTreeEntry;
 import org.spearce.jgit.lib.ObjectId;
diff --git a/org.spearce.egit.core.test/src/org/spearce/egit/core/op/T0001_ConnectProviderOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/op/T0001_ConnectProviderOperationTest.java
similarity index 96%
rename from org.spearce.egit.core.test/src/org/spearce/egit/core/op/T0001_ConnectProviderOperationTest.java
rename to org.eclipse.egit.core.test/src/org/eclipse/egit/core/op/T0001_ConnectProviderOperationTest.java
index f891262..53e33e5 100644
--- a/org.spearce.egit.core.test/src/org/spearce/egit/core/op/T0001_ConnectProviderOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/op/T0001_ConnectProviderOperationTest.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.op;
+package org.eclipse.egit.core.op;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -19,8 +19,9 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.egit.core.op.ConnectProviderOperation;
+import org.eclipse.egit.core.test.GitTestCase;
 import org.eclipse.team.core.RepositoryProvider;
-import org.spearce.egit.core.test.GitTestCase;
 import org.spearce.jgit.lib.Commit;
 import org.spearce.jgit.lib.FileTreeEntry;
 import org.spearce.jgit.lib.ObjectId;
diff --git a/org.spearce.egit.core.test/src/org/spearce/egit/core/test/Activator.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/Activator.java
similarity index 93%
rename from org.spearce.egit.core.test/src/org/spearce/egit/core/test/Activator.java
rename to org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/Activator.java
index 6b9f236..d824745 100644
--- a/org.spearce.egit.core.test/src/org/spearce/egit/core/test/Activator.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/Activator.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.test;
+package org.eclipse.egit.core.test;
 
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;
@@ -16,7 +16,7 @@
 public class Activator extends Plugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.spearce.egit.core.test";
+	public static final String PLUGIN_ID = "org.eclipse.egit.core.test";
 
 	// The shared instance
 	private static Activator plugin;
diff --git a/org.spearce.egit.core.test/src/org/spearce/egit/core/test/GitTestCase.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitTestCase.java
similarity index 97%
rename from org.spearce.egit.core.test/src/org/spearce/egit/core/test/GitTestCase.java
rename to org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitTestCase.java
index b63f99d..59051fd 100644
--- a/org.spearce.egit.core.test/src/org/spearce/egit/core/test/GitTestCase.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitTestCase.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.test;
+package org.eclipse.egit.core.test;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/org.spearce.egit.core.test/src/org/spearce/egit/core/test/TestProject.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestProject.java
similarity index 99%
rename from org.spearce.egit.core.test/src/org/spearce/egit/core/test/TestProject.java
rename to org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestProject.java
index 2760f86..f5099da 100644
--- a/org.spearce.egit.core.test/src/org/spearce/egit/core/test/TestProject.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestProject.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.test;
+package org.eclipse.egit.core.test;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
diff --git a/org.spearce.egit.core/.classpath b/org.eclipse.egit.core/.classpath
similarity index 100%
rename from org.spearce.egit.core/.classpath
rename to org.eclipse.egit.core/.classpath
diff --git a/org.spearce.egit.core/.gitignore b/org.eclipse.egit.core/.gitignore
similarity index 100%
rename from org.spearce.egit.core/.gitignore
rename to org.eclipse.egit.core/.gitignore
diff --git a/org.eclipse.egit.core/.options b/org.eclipse.egit.core/.options
new file mode 100644
index 0000000..ef2dc61
--- /dev/null
+++ b/org.eclipse.egit.core/.options
@@ -0,0 +1 @@
+org.eclipse.egit.core/trace/verbose = false
diff --git a/org.spearce.egit.core/.project b/org.eclipse.egit.core/.project
similarity index 94%
rename from org.spearce.egit.core/.project
rename to org.eclipse.egit.core/.project
index 10bec30..e937b1c 100644
--- a/org.spearce.egit.core/.project
+++ b/org.eclipse.egit.core/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.spearce.egit.core</name>
+	<name>org.eclipse.egit.core</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.spearce.egit.core/.settings/org.eclipse.core.resources.prefs b/org.eclipse.egit.core/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.spearce.egit.core/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.egit.core/.settings/org.eclipse.core.resources.prefs
diff --git a/org.spearce.egit.core/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.egit.core/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from org.spearce.egit.core/.settings/org.eclipse.core.runtime.prefs
rename to org.eclipse.egit.core/.settings/org.eclipse.core.runtime.prefs
diff --git a/org.spearce.egit.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.egit.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.spearce.egit.core/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.egit.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.spearce.egit.core/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.egit.core/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from org.spearce.egit.core/.settings/org.eclipse.jdt.ui.prefs
rename to org.eclipse.egit.core/.settings/org.eclipse.jdt.ui.prefs
diff --git a/org.spearce.egit.core/LICENSE b/org.eclipse.egit.core/LICENSE
similarity index 100%
rename from org.spearce.egit.core/LICENSE
rename to org.eclipse.egit.core/LICENSE
diff --git a/org.spearce.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF
similarity index 55%
rename from org.spearce.egit.core/META-INF/MANIFEST.MF
rename to org.eclipse.egit.core/META-INF/MANIFEST.MF
index 20df15f..43f8781 100644
--- a/org.spearce.egit.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.core/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin_name
-Bundle-SymbolicName: org.spearce.egit.core; singleton:=true
+Bundle-SymbolicName: org.eclipse.egit.core;singleton:=true
 Bundle-Version: 0.4.0.qualifier
-Bundle-Activator: org.spearce.egit.core.Activator
+Bundle-Activator: org.eclipse.egit.core.Activator
 Bundle-Vendor: %provider_name
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
@@ -12,10 +12,10 @@ Require-Bundle: org.eclipse.core.runtime,
  org.spearce.jgit,
  org.eclipse.core.filesystem,
  org.eclipse.ui
-Export-Package: org.spearce.egit.core,
- org.spearce.egit.core.internal.storage;x-friends:="org.spearce.egit.ui",
- org.spearce.egit.core.internal.util;x-friends:="org.spearce.egit.ui",
- org.spearce.egit.core.op,
- org.spearce.egit.core.project
+Export-Package: org.eclipse.egit.core,
+ org.eclipse.egit.core.internal.storage;x-friends:="org.eclipse.egit.ui",
+ org.eclipse.egit.core.internal.util;x-friends:="org.eclipse.egit.ui",
+ org.eclipse.egit.core.op,
+ org.eclipse.egit.core.project
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.spearce.egit.core/build.properties b/org.eclipse.egit.core/build.properties
similarity index 100%
rename from org.spearce.egit.core/build.properties
rename to org.eclipse.egit.core/build.properties
diff --git a/org.spearce.egit.core/plugin.properties b/org.eclipse.egit.core/plugin.properties
similarity index 58%
rename from org.spearce.egit.core/plugin.properties
rename to org.eclipse.egit.core/plugin.properties
index 6e73eef..dec19bd 100644
--- a/org.spearce.egit.core/plugin.properties
+++ b/org.eclipse.egit.core/plugin.properties
@@ -1,2 +1,2 @@
 plugin_name=Git Team Provider (Core)
-provider_name=spearce.org
+provider_name=eclipse.org
diff --git a/org.spearce.egit.core/plugin.xml b/org.eclipse.egit.core/plugin.xml
similarity index 73%
rename from org.spearce.egit.core/plugin.xml
rename to org.eclipse.egit.core/plugin.xml
index 77ecebf..844d5f5 100644
--- a/org.spearce.egit.core/plugin.xml
+++ b/org.eclipse.egit.core/plugin.xml
@@ -2,13 +2,13 @@
 <?eclipse version="3.0"?>
 <plugin>
    <extension point="org.eclipse.core.runtime.preferences">
-      <initializer class="org.spearce.egit.core.GitCorePreferenceInitializer"/>
+      <initializer class="org.eclipse.egit.core.GitCorePreferenceInitializer"/>
    </extension>
 
   <extension point="org.eclipse.team.core.repository">
 	<repository
-    		class="org.spearce.egit.core.GitProvider"
-		id="org.spearce.egit.core.GitProvider">
+    		class="org.eclipse.egit.core.GitProvider"
+		id="org.eclipse.egit.core.GitProvider">
 	</repository>
   </extension>
   <extension
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/Activator.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java
similarity index 95%
rename from org.spearce.egit.core/src/org/spearce/egit/core/Activator.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java
index 903862f..06e64e8 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/Activator.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java
@@ -6,18 +6,18 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core;
+package org.eclipse.egit.core;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.egit.core.project.GitProjectData;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
-import org.spearce.egit.core.project.GitProjectData;
 
 /**
- * The plugin class for the org.spearce.egit.core plugin. This
+ * The plugin class for the org.eclipse.egit.core plugin. This
  * is a singleton class.
  */
 public class Activator extends AbstractUIPlugin {
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/AdaptableFileTreeIterator.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/AdaptableFileTreeIterator.java
similarity index 97%
rename from org.spearce.egit.core/src/org/spearce/egit/core/AdaptableFileTreeIterator.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/AdaptableFileTreeIterator.java
index 61211f6..c69196f 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/AdaptableFileTreeIterator.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/AdaptableFileTreeIterator.java
@@ -6,7 +6,7 @@
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
 
-package org.spearce.egit.core;
+package org.eclipse.egit.core;
 
 import java.io.File;
 import java.io.IOException;
@@ -26,7 +26,7 @@
  * recursing into directories that are accessible from the given workspace root.
  *
  * @see org.spearce.jgit.treewalk.FileTreeIterator
- * @see org.spearce.egit.core.ContainerTreeIterator
+ * @see org.eclipse.egit.core.ContainerTreeIterator
  */
 public class AdaptableFileTreeIterator extends FileTreeIterator {
 
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/ContainerTreeIterator.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/ContainerTreeIterator.java
similarity index 98%
rename from org.spearce.egit.core/src/org/spearce/egit/core/ContainerTreeIterator.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/ContainerTreeIterator.java
index 7ac1903..d44c2b0 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/ContainerTreeIterator.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/ContainerTreeIterator.java
@@ -6,7 +6,7 @@
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
 
-package org.spearce.egit.core;
+package org.eclipse.egit.core;
 
 import java.io.File;
 import java.io.IOException;
@@ -17,7 +17,7 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.runtime.CoreException;
-import org.spearce.egit.core.project.RepositoryMapping;
+import org.eclipse.egit.core.project.RepositoryMapping;
 import org.spearce.jgit.errors.IncorrectObjectTypeException;
 import org.spearce.jgit.lib.Constants;
 import org.spearce.jgit.lib.FileMode;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/CoreText.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/CoreText.java
similarity index 96%
rename from org.spearce.egit.core/src/org/spearce/egit/core/CoreText.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/CoreText.java
index 6b2627b..5e42c67 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/CoreText.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/CoreText.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core;
+package org.eclipse.egit.core;
 
 import org.eclipse.osgi.util.NLS;
 
@@ -100,6 +100,6 @@
 	public static String PushOperation_taskNameNormalRun;
 
 	static {
-		initializeMessages("org.spearce.egit.core.coretext", CoreText.class);
+		initializeMessages("org.eclipse.egit.core.coretext", CoreText.class);
 	}
 }
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/EclipseGitProgressTransformer.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseGitProgressTransformer.java
similarity index 98%
rename from org.spearce.egit.core/src/org/spearce/egit/core/EclipseGitProgressTransformer.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseGitProgressTransformer.java
index 7535e8c..33a9457 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/EclipseGitProgressTransformer.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseGitProgressTransformer.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core;
+package org.eclipse.egit.core;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubProgressMonitor;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/GitCorePreferenceInitializer.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/GitCorePreferenceInitializer.java
similarity index 97%
rename from org.spearce.egit.core/src/org/spearce/egit/core/GitCorePreferenceInitializer.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/GitCorePreferenceInitializer.java
index fc4768b..ea1549b 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/GitCorePreferenceInitializer.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/GitCorePreferenceInitializer.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core;
+package org.eclipse.egit.core;
 
 import org.eclipse.core.runtime.Preferences;
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/GitCorePreferences.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/GitCorePreferences.java
similarity index 96%
rename from org.spearce.egit.core/src/org/spearce/egit/core/GitCorePreferences.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/GitCorePreferences.java
index 7148b12..2e18239 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/GitCorePreferences.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/GitCorePreferences.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core;
+package org.eclipse.egit.core;
 
 /** Preferences used by the core plugin. */
 public class GitCorePreferences {
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/GitException.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/GitException.java
similarity index 99%
rename from org.spearce.egit.core/src/org/spearce/egit/core/GitException.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/GitException.java
index 4724b22..08daddd 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/GitException.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/GitException.java
@@ -7,7 +7,7 @@
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
 
-package org.spearce.egit.core;
+package org.eclipse.egit.core;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/GitMoveDeleteHook.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/GitMoveDeleteHook.java
similarity index 98%
rename from org.spearce.egit.core/src/org/spearce/egit/core/GitMoveDeleteHook.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/GitMoveDeleteHook.java
index 6130920..396939f 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/GitMoveDeleteHook.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/GitMoveDeleteHook.java
@@ -7,7 +7,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core;
+package org.eclipse.egit.core;
 
 import java.io.IOException;
 
@@ -22,8 +22,8 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.spearce.egit.core.project.GitProjectData;
-import org.spearce.egit.core.project.RepositoryMapping;
+import org.eclipse.egit.core.project.GitProjectData;
+import org.eclipse.egit.core.project.RepositoryMapping;
 import org.spearce.jgit.dircache.DirCache;
 import org.spearce.jgit.dircache.DirCacheBuilder;
 import org.spearce.jgit.dircache.DirCacheEditor;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/GitProvider.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/GitProvider.java
similarity index 94%
rename from org.spearce.egit.core/src/org/spearce/egit/core/GitProvider.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/GitProvider.java
index db3a857..0793ee0 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/GitProvider.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/GitProvider.java
@@ -6,16 +6,16 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core;
+package org.eclipse.egit.core;
 
 import org.eclipse.core.resources.IResourceRuleFactory;
 import org.eclipse.core.resources.team.IMoveDeleteHook;
 import org.eclipse.core.resources.team.ResourceRuleFactory;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.egit.core.internal.storage.GitFileHistoryProvider;
+import org.eclipse.egit.core.project.GitProjectData;
 import org.eclipse.team.core.RepositoryProvider;
 import org.eclipse.team.core.history.IFileHistoryProvider;
-import org.spearce.egit.core.internal.storage.GitFileHistoryProvider;
-import org.spearce.egit.core.project.GitProjectData;
 
 /**
  * The Team provider class for a Git repository.
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/GitTag.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/GitTag.java
similarity index 96%
rename from org.spearce.egit.core/src/org/spearce/egit/core/GitTag.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/GitTag.java
index dcdc551..ea1c8e2 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/GitTag.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/GitTag.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core;
+package org.eclipse.egit.core;
 
 import org.eclipse.team.core.history.ITag;
 
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/ResourceList.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/ResourceList.java
similarity index 97%
rename from org.spearce.egit.core/src/org/spearce/egit/core/ResourceList.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/ResourceList.java
index bc3d049..9cb7e00 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/ResourceList.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/ResourceList.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core;
+package org.eclipse.egit.core;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IAdaptable;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/coretext.properties b/org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties
similarity index 100%
rename from org.spearce.egit.core/src/org/spearce/egit/core/coretext.properties
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/internal/UpdateJob.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/UpdateJob.java
similarity index 96%
rename from org.spearce.egit.core/src/org/spearce/egit/core/internal/UpdateJob.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/internal/UpdateJob.java
index be1c591..2ffdd98 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/internal/UpdateJob.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/UpdateJob.java
@@ -7,7 +7,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.internal;
+package org.eclipse.egit.core.internal;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,9 +27,9 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.spearce.egit.core.Activator;
-import org.spearce.egit.core.CoreText;
-import org.spearce.egit.core.project.RepositoryMapping;
+import org.eclipse.egit.core.Activator;
+import org.eclipse.egit.core.CoreText;
+import org.eclipse.egit.core.project.RepositoryMapping;
 import org.spearce.jgit.errors.NotSupportedException;
 import org.spearce.jgit.lib.GitIndex;
 import org.spearce.jgit.lib.GitIndex.Entry;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/BlobStorage.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/BlobStorage.java
similarity index 98%
rename from org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/BlobStorage.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/BlobStorage.java
index 1c708ce..2562766 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/BlobStorage.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/BlobStorage.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.internal.storage;
+package org.eclipse.egit.core.internal.storage;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/CommitFileRevision.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/CommitFileRevision.java
similarity index 97%
rename from org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/CommitFileRevision.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/CommitFileRevision.java
index e364027..bed203b 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/CommitFileRevision.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/CommitFileRevision.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.internal.storage;
+package org.eclipse.egit.core.internal.storage;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -19,9 +19,9 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.egit.core.GitTag;
 import org.eclipse.team.core.history.IFileRevision;
 import org.eclipse.team.core.history.ITag;
-import org.spearce.egit.core.GitTag;
 import org.spearce.jgit.lib.AnyObjectId;
 import org.spearce.jgit.lib.ObjectId;
 import org.spearce.jgit.lib.PersonIdent;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/GitFileHistory.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/GitFileHistory.java
similarity index 97%
rename from org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/GitFileHistory.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/GitFileHistory.java
index c262b9c..ffff7b3 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/GitFileHistory.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/GitFileHistory.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.internal.storage;
+package org.eclipse.egit.core.internal.storage;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -14,11 +14,11 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.egit.core.Activator;
+import org.eclipse.egit.core.project.RepositoryMapping;
 import org.eclipse.team.core.history.IFileHistoryProvider;
 import org.eclipse.team.core.history.IFileRevision;
 import org.eclipse.team.core.history.provider.FileHistory;
-import org.spearce.egit.core.Activator;
-import org.spearce.egit.core.project.RepositoryMapping;
 import org.spearce.jgit.lib.AnyObjectId;
 import org.spearce.jgit.lib.Constants;
 import org.spearce.jgit.lib.ObjectId;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/GitFileHistoryProvider.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/GitFileHistoryProvider.java
similarity index 96%
rename from org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/GitFileHistoryProvider.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/GitFileHistoryProvider.java
index a57df10..4cfa2aa 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/GitFileHistoryProvider.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/GitFileHistoryProvider.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.internal.storage;
+package org.eclipse.egit.core.internal.storage;
 
 import org.eclipse.core.filesystem.IFileStore;
 import org.eclipse.core.resources.IResource;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/GitFileRevision.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/GitFileRevision.java
similarity index 98%
rename from org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/GitFileRevision.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/GitFileRevision.java
index 2f23c7d..d818d15 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/GitFileRevision.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/GitFileRevision.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.internal.storage;
+package org.eclipse.egit.core.internal.storage;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/IndexFileRevision.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/IndexFileRevision.java
similarity index 98%
rename from org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/IndexFileRevision.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/IndexFileRevision.java
index a0b7ad2..3a068f7 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/IndexFileRevision.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/IndexFileRevision.java
@@ -7,7 +7,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.internal.storage;
+package org.eclipse.egit.core.internal.storage;
 
 import java.io.IOException;
 
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/KidCommit.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/KidCommit.java
similarity index 95%
rename from org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/KidCommit.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/KidCommit.java
index e4390db..33a350e 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/KidCommit.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/KidCommit.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.internal.storage;
+package org.eclipse.egit.core.internal.storage;
 
 import org.spearce.jgit.lib.AnyObjectId;
 import org.spearce.jgit.revwalk.RevCommit;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/KidCommitList.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/KidCommitList.java
similarity index 94%
rename from org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/KidCommitList.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/KidCommitList.java
index ffe2d9a..7d9c943 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/KidCommitList.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/KidCommitList.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.internal.storage;
+package org.eclipse.egit.core.internal.storage;
 
 import org.spearce.jgit.revwalk.RevCommitList;
 
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/KidWalk.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/KidWalk.java
similarity index 94%
rename from org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/KidWalk.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/KidWalk.java
index 6b8f468..3b42345 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/KidWalk.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/KidWalk.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.internal.storage;
+package org.eclipse.egit.core.internal.storage;
 
 import org.spearce.jgit.lib.AnyObjectId;
 import org.spearce.jgit.lib.Repository;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/WorkspaceFileRevision.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/WorkspaceFileRevision.java
similarity index 97%
rename from org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/WorkspaceFileRevision.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/WorkspaceFileRevision.java
index 6ab5bbc..0b61be5 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/internal/storage/WorkspaceFileRevision.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/WorkspaceFileRevision.java
@@ -7,7 +7,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.internal.storage;
+package org.eclipse.egit.core.internal.storage;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IStorage;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/internal/util/ExceptionCollector.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/util/ExceptionCollector.java
similarity index 98%
rename from org.spearce.egit.core/src/org/spearce/egit/core/internal/util/ExceptionCollector.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/internal/util/ExceptionCollector.java
index 404ee00..a2cb287 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/internal/util/ExceptionCollector.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/util/ExceptionCollector.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.spearce.egit.core.internal.util;
+package org.eclipse.egit.core.internal.util;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/op/AssumeUnchangedOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/AssumeUnchangedOperation.java
similarity index 94%
rename from org.spearce.egit.core/src/org/spearce/egit/core/op/AssumeUnchangedOperation.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/op/AssumeUnchangedOperation.java
index 57bb526..ba3547e 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/op/AssumeUnchangedOperation.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/AssumeUnchangedOperation.java
@@ -7,7 +7,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.op;
+package org.eclipse.egit.core.op;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -22,10 +22,10 @@
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.spearce.egit.core.Activator;
-import org.spearce.egit.core.CoreText;
-import org.spearce.egit.core.project.GitProjectData;
-import org.spearce.egit.core.project.RepositoryMapping;
+import org.eclipse.egit.core.Activator;
+import org.eclipse.egit.core.CoreText;
+import org.eclipse.egit.core.project.GitProjectData;
+import org.eclipse.egit.core.project.RepositoryMapping;
 import org.spearce.jgit.dircache.DirCache;
 import org.spearce.jgit.dircache.DirCacheEntry;
 import org.spearce.jgit.lib.Repository;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/op/BranchOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/BranchOperation.java
similarity index 99%
rename from org.spearce.egit.core/src/org/spearce/egit/core/op/BranchOperation.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/op/BranchOperation.java
index f472f29..8a40f83 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/op/BranchOperation.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/BranchOperation.java
@@ -7,7 +7,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.op;
+package org.eclipse.egit.core.op;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/op/CloneOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CloneOperation.java
similarity index 98%
rename from org.spearce.egit.core/src/org/spearce/egit/core/op/CloneOperation.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/op/CloneOperation.java
index f31940f..1cfa867 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/op/CloneOperation.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CloneOperation.java
@@ -9,7 +9,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.op;
+package org.eclipse.egit.core.op;
 
 import java.io.File;
 import java.io.IOException;
@@ -20,10 +20,10 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.egit.core.CoreText;
+import org.eclipse.egit.core.EclipseGitProgressTransformer;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.osgi.util.NLS;
-import org.spearce.egit.core.CoreText;
-import org.spearce.egit.core.EclipseGitProgressTransformer;
 import org.spearce.jgit.errors.NotSupportedException;
 import org.spearce.jgit.errors.TransportException;
 import org.spearce.jgit.lib.Commit;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/op/ConnectProviderOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ConnectProviderOperation.java
similarity index 90%
rename from org.spearce.egit.core/src/org/spearce/egit/core/op/ConnectProviderOperation.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/op/ConnectProviderOperation.java
index 274fabb..3c355f6 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/op/ConnectProviderOperation.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ConnectProviderOperation.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.op;
+package org.eclipse.egit.core.op;
 
 import java.util.Collection;
 
@@ -17,14 +17,14 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.egit.core.Activator;
+import org.eclipse.egit.core.CoreText;
+import org.eclipse.egit.core.GitProvider;
+import org.eclipse.egit.core.project.GitProjectData;
+import org.eclipse.egit.core.project.RepositoryFinder;
+import org.eclipse.egit.core.project.RepositoryMapping;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.team.core.RepositoryProvider;
-import org.spearce.egit.core.Activator;
-import org.spearce.egit.core.CoreText;
-import org.spearce.egit.core.GitProvider;
-import org.spearce.egit.core.project.GitProjectData;
-import org.spearce.egit.core.project.RepositoryFinder;
-import org.spearce.egit.core.project.RepositoryMapping;
 
 /**
  * Connects Eclipse to an existing Git repository
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/op/DisconnectProviderOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DisconnectProviderOperation.java
similarity index 95%
rename from org.spearce.egit.core/src/org/spearce/egit/core/op/DisconnectProviderOperation.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/op/DisconnectProviderOperation.java
index b63c69b..106a4ad 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/op/DisconnectProviderOperation.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DisconnectProviderOperation.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.op;
+package org.eclipse.egit.core.op;
 
 import java.util.Collection;
 
@@ -18,9 +18,9 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.egit.core.Activator;
+import org.eclipse.egit.core.CoreText;
 import org.eclipse.team.core.RepositoryProvider;
-import org.spearce.egit.core.Activator;
-import org.spearce.egit.core.CoreText;
 
 /**
  * Disconnects the Git team provider from a project.
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/op/ListRemoteOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ListRemoteOperation.java
similarity index 97%
rename from org.spearce.egit.core/src/org/spearce/egit/core/op/ListRemoteOperation.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/op/ListRemoteOperation.java
index ecb2697..a39aa85 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/op/ListRemoteOperation.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ListRemoteOperation.java
@@ -6,15 +6,15 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.op;
+package org.eclipse.egit.core.op;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
 import java.util.Map;
 
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.egit.core.CoreText;
 import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.spearce.egit.core.CoreText;
 import org.spearce.jgit.errors.NotSupportedException;
 import org.spearce.jgit.errors.TransportException;
 import org.spearce.jgit.lib.Ref;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/op/PushOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperation.java
similarity index 97%
rename from org.spearce.egit.core/src/org/spearce/egit/core/op/PushOperation.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperation.java
index a0f2e5c..b3cb0ec 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/op/PushOperation.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperation.java
@@ -5,17 +5,17 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.op;
+package org.eclipse.egit.core.op;
 
 import java.lang.reflect.InvocationTargetException;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.egit.core.CoreText;
+import org.eclipse.egit.core.EclipseGitProgressTransformer;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.osgi.util.NLS;
-import org.spearce.egit.core.CoreText;
-import org.spearce.egit.core.EclipseGitProgressTransformer;
 import org.spearce.jgit.errors.NoRemoteRepositoryException;
 import org.spearce.jgit.errors.NotSupportedException;
 import org.spearce.jgit.errors.TransportException;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/op/PushOperationResult.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperationResult.java
similarity index 99%
rename from org.spearce.egit.core/src/org/spearce/egit/core/op/PushOperationResult.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperationResult.java
index e3a392d..8a46c28 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/op/PushOperationResult.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperationResult.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.op;
+package org.eclipse.egit.core.op;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/op/PushOperationSpecification.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperationSpecification.java
similarity index 98%
rename from org.spearce.egit.core/src/org/spearce/egit/core/op/PushOperationSpecification.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperationSpecification.java
index 5e0be18..4139aff 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/op/PushOperationSpecification.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperationSpecification.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.op;
+package org.eclipse.egit.core.op;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/op/ResetOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ResetOperation.java
similarity index 99%
rename from org.spearce.egit.core/src/org/spearce/egit/core/op/ResetOperation.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/op/ResetOperation.java
index c28d618..df57ab2 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/op/ResetOperation.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ResetOperation.java
@@ -7,7 +7,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.op;
+package org.eclipse.egit.core.op;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/op/TrackOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/TrackOperation.java
similarity index 96%
rename from org.spearce.egit.core/src/org/spearce/egit/core/op/TrackOperation.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/op/TrackOperation.java
index 5f80698..2bb6cd7 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/op/TrackOperation.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/TrackOperation.java
@@ -7,7 +7,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.op;
+package org.eclipse.egit.core.op;
 
 import java.io.File;
 import java.io.IOException;
@@ -24,10 +24,10 @@
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.egit.core.Activator;
+import org.eclipse.egit.core.CoreText;
+import org.eclipse.egit.core.project.RepositoryMapping;
 import org.eclipse.team.core.Team;
-import org.spearce.egit.core.Activator;
-import org.spearce.egit.core.CoreText;
-import org.spearce.egit.core.project.RepositoryMapping;
 import org.spearce.jgit.lib.GitIndex;
 import org.spearce.jgit.lib.GitIndex.Entry;
 
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/op/UntrackOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/UntrackOperation.java
similarity index 94%
rename from org.spearce.egit.core/src/org/spearce/egit/core/op/UntrackOperation.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/op/UntrackOperation.java
index 4656552..e2d3669 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/op/UntrackOperation.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/UntrackOperation.java
@@ -7,7 +7,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.op;
+package org.eclipse.egit.core.op;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -22,10 +22,10 @@
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.spearce.egit.core.Activator;
-import org.spearce.egit.core.CoreText;
-import org.spearce.egit.core.project.GitProjectData;
-import org.spearce.egit.core.project.RepositoryMapping;
+import org.eclipse.egit.core.Activator;
+import org.eclipse.egit.core.CoreText;
+import org.eclipse.egit.core.project.GitProjectData;
+import org.eclipse.egit.core.project.RepositoryMapping;
 import org.spearce.jgit.dircache.DirCache;
 import org.spearce.jgit.dircache.DirCacheEditor;
 import org.spearce.jgit.lib.Repository;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/op/UpdateOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/UpdateOperation.java
similarity index 94%
rename from org.spearce.egit.core/src/org/spearce/egit/core/op/UpdateOperation.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/op/UpdateOperation.java
index 1c915a7..7e0f1a4 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/op/UpdateOperation.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/UpdateOperation.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.op;
+package org.eclipse.egit.core.op;
 
 import java.util.Collection;
 
@@ -14,7 +14,7 @@
 import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.spearce.egit.core.internal.UpdateJob;
+import org.eclipse.egit.core.internal.UpdateJob;
 
 /**
  * Updates the Git index for the selected resources. Only tracked resources
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/project/GitProjectData.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java
similarity index 98%
rename from org.spearce.egit.core/src/org/spearce/egit/core/project/GitProjectData.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java
index 31d5483..33348f7 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/project/GitProjectData.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java
@@ -7,7 +7,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.project;
+package org.eclipse.egit.core.project;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -34,12 +34,12 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Preferences;
 import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.egit.core.Activator;
+import org.eclipse.egit.core.CoreText;
+import org.eclipse.egit.core.GitCorePreferences;
+import org.eclipse.egit.core.GitProvider;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.team.core.RepositoryProvider;
-import org.spearce.egit.core.Activator;
-import org.spearce.egit.core.CoreText;
-import org.spearce.egit.core.GitCorePreferences;
-import org.spearce.egit.core.GitProvider;
 import org.spearce.jgit.lib.Repository;
 import org.spearce.jgit.lib.WindowCache;
 import org.spearce.jgit.lib.WindowCacheConfig;
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/project/RepositoryChangeListener.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/project/RepositoryChangeListener.java
similarity index 96%
rename from org.spearce.egit.core/src/org/spearce/egit/core/project/RepositoryChangeListener.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/project/RepositoryChangeListener.java
index 01da17b..b4e4fd4 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/project/RepositoryChangeListener.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/project/RepositoryChangeListener.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.project;
+package org.eclipse.egit.core.project;
 
 /**
  * Receives notification of a repository change event.
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/project/RepositoryFinder.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/project/RepositoryFinder.java
similarity index 98%
rename from org.spearce.egit.core/src/org/spearce/egit/core/project/RepositoryFinder.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/project/RepositoryFinder.java
index 2b4b16f..efbba51 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/project/RepositoryFinder.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/project/RepositoryFinder.java
@@ -7,7 +7,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.project;
+package org.eclipse.egit.core.project;
 
 import java.io.File;
 import java.io.IOException;
@@ -22,7 +22,7 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.SubProgressMonitor;
-import org.spearce.egit.core.CoreText;
+import org.eclipse.egit.core.CoreText;
 
 /**
  * Searches for existing Git repositories associated with a project's files.
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/project/RepositoryMapping.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/project/RepositoryMapping.java
similarity index 98%
rename from org.spearce.egit.core/src/org/spearce/egit/core/project/RepositoryMapping.java
rename to org.eclipse.egit.core/src/org/eclipse/egit/core/project/RepositoryMapping.java
index 029c56a..795e7ec 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/project/RepositoryMapping.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/project/RepositoryMapping.java
@@ -9,7 +9,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.core.project;
+package org.eclipse.egit.core.project;
 
 import java.io.File;
 import java.io.IOException;
@@ -22,8 +22,8 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.egit.core.GitProvider;
 import org.eclipse.team.core.RepositoryProvider;
-import org.spearce.egit.core.GitProvider;
 import org.spearce.jgit.lib.Constants;
 import org.spearce.jgit.lib.GitIndex;
 import org.spearce.jgit.lib.Repository;
diff --git a/org.spearce.egit.ui/.classpath b/org.eclipse.egit.ui/.classpath
similarity index 100%
rename from org.spearce.egit.ui/.classpath
rename to org.eclipse.egit.ui/.classpath
diff --git a/org.spearce.egit.ui/.gitignore b/org.eclipse.egit.ui/.gitignore
similarity index 100%
rename from org.spearce.egit.ui/.gitignore
rename to org.eclipse.egit.ui/.gitignore
diff --git a/org.eclipse.egit.ui/.options b/org.eclipse.egit.ui/.options
new file mode 100644
index 0000000..d18ab48
--- /dev/null
+++ b/org.eclipse.egit.ui/.options
@@ -0,0 +1 @@
+org.eclipse.egit.ui/trace/verbose = false
diff --git a/org.spearce.egit.ui/.project b/org.eclipse.egit.ui/.project
similarity index 95%
rename from org.spearce.egit.ui/.project
rename to org.eclipse.egit.ui/.project
index 86da7ff..d97ce52 100644
--- a/org.spearce.egit.ui/.project
+++ b/org.eclipse.egit.ui/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.spearce.egit.ui</name>
+	<name>org.eclipse.egit.ui</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.spearce.egit.ui/.settings/org.eclipse.core.resources.prefs b/org.eclipse.egit.ui/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.spearce.egit.ui/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.egit.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/org.spearce.egit.ui/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.egit.ui/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from org.spearce.egit.ui/.settings/org.eclipse.core.runtime.prefs
rename to org.eclipse.egit.ui/.settings/org.eclipse.core.runtime.prefs
diff --git a/org.spearce.egit.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.egit.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.spearce.egit.ui/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.egit.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.spearce.egit.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.egit.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from org.spearce.egit.ui/.settings/org.eclipse.jdt.ui.prefs
rename to org.eclipse.egit.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/org.spearce.egit.ui/LICENSE b/org.eclipse.egit.ui/LICENSE
similarity index 100%
rename from org.spearce.egit.ui/LICENSE
rename to org.eclipse.egit.ui/LICENSE
diff --git a/org.spearce.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF
similarity index 84%
rename from org.spearce.egit.ui/META-INF/MANIFEST.MF
rename to org.eclipse.egit.ui/META-INF/MANIFEST.MF
index f78a4a7..b0f6d76 100644
--- a/org.spearce.egit.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin_name
-Bundle-SymbolicName: org.spearce.egit.ui; singleton:=true
+Bundle-SymbolicName: org.eclipse.egit.ui;singleton:=true
 Bundle-Version: 0.4.0.qualifier
-Bundle-Activator: org.spearce.egit.ui.Activator
+Bundle-Activator: org.eclipse.egit.ui.Activator
 Bundle-Vendor: %provider_name
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.compare,
  org.spearce.jgit,
- org.spearce.egit.core,
+ org.eclipse.egit.core,
  org.eclipse.ui.ide,
  org.eclipse.jsch.ui;bundle-version="1.1.100"
 Bundle-ActivationPolicy: lazy
diff --git a/org.spearce.egit.ui/build.properties b/org.eclipse.egit.ui/build.properties
similarity index 100%
rename from org.spearce.egit.ui/build.properties
rename to org.eclipse.egit.ui/build.properties
diff --git a/org.spearce.egit.ui/icons/checkboxes/disabled_checked.gif b/org.eclipse.egit.ui/icons/checkboxes/disabled_checked.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/checkboxes/disabled_checked.gif
rename to org.eclipse.egit.ui/icons/checkboxes/disabled_checked.gif
diff --git a/org.spearce.egit.ui/icons/checkboxes/disabled_unchecked.gif b/org.eclipse.egit.ui/icons/checkboxes/disabled_unchecked.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/checkboxes/disabled_unchecked.gif
rename to org.eclipse.egit.ui/icons/checkboxes/disabled_unchecked.gif
diff --git a/org.spearce.egit.ui/icons/checkboxes/enabled_checked.gif b/org.eclipse.egit.ui/icons/checkboxes/enabled_checked.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/checkboxes/enabled_checked.gif
rename to org.eclipse.egit.ui/icons/checkboxes/enabled_checked.gif
diff --git a/org.spearce.egit.ui/icons/checkboxes/enabled_unchecked.gif b/org.eclipse.egit.ui/icons/checkboxes/enabled_unchecked.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/checkboxes/enabled_unchecked.gif
rename to org.eclipse.egit.ui/icons/checkboxes/enabled_unchecked.gif
diff --git a/org.spearce.egit.ui/icons/elcl16/add.gif b/org.eclipse.egit.ui/icons/elcl16/add.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/elcl16/add.gif
rename to org.eclipse.egit.ui/icons/elcl16/add.gif
diff --git a/org.spearce.egit.ui/icons/elcl16/author.gif b/org.eclipse.egit.ui/icons/elcl16/author.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/elcl16/author.gif
rename to org.eclipse.egit.ui/icons/elcl16/author.gif
diff --git a/org.spearce.egit.ui/icons/elcl16/clear.gif b/org.eclipse.egit.ui/icons/elcl16/clear.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/elcl16/clear.gif
rename to org.eclipse.egit.ui/icons/elcl16/clear.gif
diff --git a/org.spearce.egit.ui/icons/elcl16/comment.gif b/org.eclipse.egit.ui/icons/elcl16/comment.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/elcl16/comment.gif
rename to org.eclipse.egit.ui/icons/elcl16/comment.gif
diff --git a/org.spearce.egit.ui/icons/elcl16/commit.gif b/org.eclipse.egit.ui/icons/elcl16/commit.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/elcl16/commit.gif
rename to org.eclipse.egit.ui/icons/elcl16/commit.gif
diff --git a/org.spearce.egit.ui/icons/elcl16/committer.gif b/org.eclipse.egit.ui/icons/elcl16/committer.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/elcl16/committer.gif
rename to org.eclipse.egit.ui/icons/elcl16/committer.gif
diff --git a/org.spearce.egit.ui/icons/elcl16/delete.gif b/org.eclipse.egit.ui/icons/elcl16/delete.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/elcl16/delete.gif
rename to org.eclipse.egit.ui/icons/elcl16/delete.gif
diff --git a/org.spearce.egit.ui/icons/elcl16/filterfolder.gif b/org.eclipse.egit.ui/icons/elcl16/filterfolder.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/elcl16/filterfolder.gif
rename to org.eclipse.egit.ui/icons/elcl16/filterfolder.gif
diff --git a/org.spearce.egit.ui/icons/elcl16/filterproject.gif b/org.eclipse.egit.ui/icons/elcl16/filterproject.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/elcl16/filterproject.gif
rename to org.eclipse.egit.ui/icons/elcl16/filterproject.gif
diff --git a/org.spearce.egit.ui/icons/elcl16/filterrepo.gif b/org.eclipse.egit.ui/icons/elcl16/filterrepo.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/elcl16/filterrepo.gif
rename to org.eclipse.egit.ui/icons/elcl16/filterrepo.gif
diff --git a/org.spearce.egit.ui/icons/elcl16/find.gif b/org.eclipse.egit.ui/icons/elcl16/find.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/elcl16/find.gif
rename to org.eclipse.egit.ui/icons/elcl16/find.gif
diff --git a/org.spearce.egit.ui/icons/elcl16/next.gif b/org.eclipse.egit.ui/icons/elcl16/next.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/elcl16/next.gif
rename to org.eclipse.egit.ui/icons/elcl16/next.gif
diff --git a/org.spearce.egit.ui/icons/elcl16/previous.gif b/org.eclipse.egit.ui/icons/elcl16/previous.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/elcl16/previous.gif
rename to org.eclipse.egit.ui/icons/elcl16/previous.gif
diff --git a/org.spearce.egit.ui/icons/elcl16/trash.gif b/org.eclipse.egit.ui/icons/elcl16/trash.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/elcl16/trash.gif
rename to org.eclipse.egit.ui/icons/elcl16/trash.gif
diff --git a/org.spearce.egit.ui/icons/etool16/newconnect_wiz.gif b/org.eclipse.egit.ui/icons/etool16/newconnect_wiz.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/etool16/newconnect_wiz.gif
rename to org.eclipse.egit.ui/icons/etool16/newconnect_wiz.gif
diff --git a/org.spearce.egit.ui/icons/obj16/import_obj.gif b/org.eclipse.egit.ui/icons/obj16/import_obj.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/obj16/import_obj.gif
rename to org.eclipse.egit.ui/icons/obj16/import_obj.gif
diff --git a/org.spearce.egit.ui/icons/ovr/assume_valid.gif b/org.eclipse.egit.ui/icons/ovr/assume_valid.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/ovr/assume_valid.gif
rename to org.eclipse.egit.ui/icons/ovr/assume_valid.gif
diff --git a/org.spearce.egit.ui/icons/ovr/conflict.gif b/org.eclipse.egit.ui/icons/ovr/conflict.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/ovr/conflict.gif
rename to org.eclipse.egit.ui/icons/ovr/conflict.gif
diff --git a/org.spearce.egit.ui/icons/ovr/staged.gif b/org.eclipse.egit.ui/icons/ovr/staged.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/ovr/staged.gif
rename to org.eclipse.egit.ui/icons/ovr/staged.gif
diff --git a/org.spearce.egit.ui/icons/ovr/staged_added.gif b/org.eclipse.egit.ui/icons/ovr/staged_added.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/ovr/staged_added.gif
rename to org.eclipse.egit.ui/icons/ovr/staged_added.gif
diff --git a/org.spearce.egit.ui/icons/ovr/staged_removed.gif b/org.eclipse.egit.ui/icons/ovr/staged_removed.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/ovr/staged_removed.gif
rename to org.eclipse.egit.ui/icons/ovr/staged_removed.gif
diff --git a/org.spearce.egit.ui/icons/ovr/untracked.gif b/org.eclipse.egit.ui/icons/ovr/untracked.gif
similarity index 100%
rename from org.spearce.egit.ui/icons/ovr/untracked.gif
rename to org.eclipse.egit.ui/icons/ovr/untracked.gif
diff --git a/org.spearce.egit.ui/icons/toolbar/checkoutd.png b/org.eclipse.egit.ui/icons/toolbar/checkoutd.png
similarity index 100%
rename from org.spearce.egit.ui/icons/toolbar/checkoutd.png
rename to org.eclipse.egit.ui/icons/toolbar/checkoutd.png
diff --git a/org.spearce.egit.ui/icons/toolbar/checkoute.png b/org.eclipse.egit.ui/icons/toolbar/checkoute.png
similarity index 100%
rename from org.spearce.egit.ui/icons/toolbar/checkoute.png
rename to org.eclipse.egit.ui/icons/toolbar/checkoute.png
diff --git a/org.spearce.egit.ui/icons/toolbar/commitd.png b/org.eclipse.egit.ui/icons/toolbar/commitd.png
similarity index 100%
rename from org.spearce.egit.ui/icons/toolbar/commitd.png
rename to org.eclipse.egit.ui/icons/toolbar/commitd.png
diff --git a/org.spearce.egit.ui/icons/toolbar/commite.png b/org.eclipse.egit.ui/icons/toolbar/commite.png
similarity index 100%
rename from org.spearce.egit.ui/icons/toolbar/commite.png
rename to org.eclipse.egit.ui/icons/toolbar/commite.png
diff --git a/org.spearce.egit.ui/icons/toolbar/fetchd.png b/org.eclipse.egit.ui/icons/toolbar/fetchd.png
similarity index 100%
rename from org.spearce.egit.ui/icons/toolbar/fetchd.png
rename to org.eclipse.egit.ui/icons/toolbar/fetchd.png
diff --git a/org.spearce.egit.ui/icons/toolbar/fetche.png b/org.eclipse.egit.ui/icons/toolbar/fetche.png
similarity index 100%
rename from org.spearce.egit.ui/icons/toolbar/fetche.png
rename to org.eclipse.egit.ui/icons/toolbar/fetche.png
diff --git a/org.spearce.egit.ui/icons/toolbar/pushd.png b/org.eclipse.egit.ui/icons/toolbar/pushd.png
similarity index 100%
rename from org.spearce.egit.ui/icons/toolbar/pushd.png
rename to org.eclipse.egit.ui/icons/toolbar/pushd.png
diff --git a/org.spearce.egit.ui/icons/toolbar/pushe.png b/org.eclipse.egit.ui/icons/toolbar/pushe.png
similarity index 100%
rename from org.spearce.egit.ui/icons/toolbar/pushe.png
rename to org.eclipse.egit.ui/icons/toolbar/pushe.png
diff --git a/org.spearce.egit.ui/icons/toolbar/resetd.png b/org.eclipse.egit.ui/icons/toolbar/resetd.png
similarity index 100%
rename from org.spearce.egit.ui/icons/toolbar/resetd.png
rename to org.eclipse.egit.ui/icons/toolbar/resetd.png
diff --git a/org.spearce.egit.ui/icons/toolbar/resete.png b/org.eclipse.egit.ui/icons/toolbar/resete.png
similarity index 100%
rename from org.spearce.egit.ui/icons/toolbar/resete.png
rename to org.eclipse.egit.ui/icons/toolbar/resete.png
diff --git a/org.spearce.egit.ui/icons/toolbar/trackd.png b/org.eclipse.egit.ui/icons/toolbar/trackd.png
similarity index 100%
rename from org.spearce.egit.ui/icons/toolbar/trackd.png
rename to org.eclipse.egit.ui/icons/toolbar/trackd.png
diff --git a/org.spearce.egit.ui/icons/toolbar/tracke.png b/org.eclipse.egit.ui/icons/toolbar/tracke.png
similarity index 100%
rename from org.spearce.egit.ui/icons/toolbar/tracke.png
rename to org.eclipse.egit.ui/icons/toolbar/tracke.png
diff --git a/org.spearce.egit.ui/icons/wizban/import_wiz.png b/org.eclipse.egit.ui/icons/wizban/import_wiz.png
similarity index 100%
rename from org.spearce.egit.ui/icons/wizban/import_wiz.png
rename to org.eclipse.egit.ui/icons/wizban/import_wiz.png
diff --git a/org.spearce.egit.ui/icons/wizban/newconnect_wizban.png b/org.eclipse.egit.ui/icons/wizban/newconnect_wizban.png
similarity index 100%
rename from org.spearce.egit.ui/icons/wizban/newconnect_wizban.png
rename to org.eclipse.egit.ui/icons/wizban/newconnect_wizban.png
diff --git a/org.spearce.egit.ui/plugin.properties b/org.eclipse.egit.ui/plugin.properties
similarity index 98%
rename from org.spearce.egit.ui/plugin.properties
rename to org.eclipse.egit.ui/plugin.properties
index 523a959..399a639 100644
--- a/org.spearce.egit.ui/plugin.properties
+++ b/org.eclipse.egit.ui/plugin.properties
@@ -1,5 +1,5 @@
 plugin_name=Git Team Provider (UI)
-provider_name=spearce.org
+provider_name=eclipse.org
 
 Git=Git
 
diff --git a/org.spearce.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml
similarity index 61%
rename from org.spearce.egit.ui/plugin.xml
rename to org.eclipse.egit.ui/plugin.xml
index a94c8bc..3605353 100644
--- a/org.spearce.egit.ui/plugin.xml
+++ b/org.eclipse.egit.ui/plugin.xml
@@ -2,17 +2,17 @@
 <?eclipse version="3.0"?>
 <plugin>
    <extension point="org.eclipse.core.runtime.preferences">
-      <initializer class="org.spearce.egit.ui.PluginPreferenceInitializer"/>
+      <initializer class="org.eclipse.egit.ui.PluginPreferenceInitializer"/>
    </extension>
 
    <extension point="org.eclipse.ui.importWizards">
       <category name="%Git_clone_category"
-	    id="org.spearce.egit.ui.internal.clone.gitclonecategory"/>
+	    id="org.eclipse.egit.ui.internal.clone.gitclonecategory"/>
       <wizard name="%Git_clone_wizard"
 	    icon="icons/obj16/import_obj.gif"
-	    class="org.spearce.egit.ui.internal.clone.GitCloneWizard"
-	    id="org.spearce.egit.ui.internal.clone.GitCloneWizard"
-	    category="org.spearce.egit.ui.internal.clone.gitclonecategory">
+	    class="org.eclipse.egit.ui.internal.clone.GitCloneWizard"
+	    id="org.eclipse.egit.ui.internal.clone.GitCloneWizard"
+	    category="org.eclipse.egit.ui.internal.clone.gitclonecategory">
 	    <description>%Git_clone_description</description>
       </wizard>
    </extension>
@@ -20,147 +20,147 @@
    <extension point="org.eclipse.team.ui.configurationWizards">
       <wizard name="%SharingWizard_name"
 	    icon="icons/etool16/newconnect_wiz.gif"
-            class="org.spearce.egit.ui.internal.sharing.SharingWizard"
-            id="org.spearce.egit.ui.internal.sharing.SharingWizard">
+            class="org.eclipse.egit.ui.internal.sharing.SharingWizard"
+            id="org.eclipse.egit.ui.internal.sharing.SharingWizard">
       </wizard>
    </extension>
 
    <extension point="org.eclipse.ui.popupMenus">
-      <objectContribution id="org.spearce.egit.ui.projectContributions"
+      <objectContribution id="org.eclipse.egit.ui.projectContributions"
             objectClass="org.eclipse.core.resources.IProject"
             adaptable="true">
          <filter name="projectPersistentProperty"
-               value="org.eclipse.team.core.repository=org.spearce.egit.core.GitProvider">
+               value="org.eclipse.team.core.repository=org.eclipse.egit.core.GitProvider">
          </filter>
          <action
                label="%DisconnectAction_label"
                tooltip="%DisconnectAction_tooltip"
-               class="org.spearce.egit.ui.internal.actions.Disconnect"
+               class="org.eclipse.egit.ui.internal.actions.Disconnect"
                menubarPath="team.main/projectGroup"
-               id="org.spearce.egit.ui.internal.actions.Disconnect">
+               id="org.eclipse.egit.ui.internal.actions.Disconnect">
          </action>
          <action
-               class="org.spearce.egit.ui.internal.actions.FetchAction"
-               id="org.spearce.egit.ui.internal.actions.FetchAction"
+               class="org.eclipse.egit.ui.internal.actions.FetchAction"
+               id="org.eclipse.egit.ui.internal.actions.FetchAction"
                label="%FetchAction_label"
                menubarPath="team.main/projectGroup"
                tooltip="%FetchAction_tooltip"/>
          <action
-               class="org.spearce.egit.ui.internal.actions.PushAction"
-               id="org.spearce.egit.ui.internal.actions.PushAction"
+               class="org.eclipse.egit.ui.internal.actions.PushAction"
+               id="org.eclipse.egit.ui.internal.actions.PushAction"
                label="%PushAction_label"
                menubarPath="team.main/projectGroup"
                tooltip="%PushAction_tooltip"/>
          <action
-               class="org.spearce.egit.ui.internal.actions.ResetAction"
-               id="org.spearce.egit.ui.internal.actions.ResetAction"
+               class="org.eclipse.egit.ui.internal.actions.ResetAction"
+               id="org.eclipse.egit.ui.internal.actions.ResetAction"
                label="%ResetAction_label"
                menubarPath="team.main/projectGroup"
                tooltip="%ResetAction_tooltip">
          </action>
          <action
-               class="org.spearce.egit.ui.internal.actions.BranchAction"
-               id="org.spearce.egit.ui.internal.actions.BranchAction"
+               class="org.eclipse.egit.ui.internal.actions.BranchAction"
+               id="org.eclipse.egit.ui.internal.actions.BranchAction"
                label="%BranchAction_label"
                menubarPath="team.main/projectGroup"
                tooltip="%BranchAction_tooltip"/>
      </objectContribution>
      <objectContribution
             adaptable="true"
-            id="org.spearce.egit.ui.fileFolderContributions"
+            id="org.eclipse.egit.ui.fileFolderContributions"
             objectClass="org.eclipse.core.resources.IResource">
          <filter name="projectPersistentProperty"
-               value="org.eclipse.team.core.repository=org.spearce.egit.core.GitProvider">
+               value="org.eclipse.team.core.repository=org.eclipse.egit.core.GitProvider">
          </filter>
          <action
                label="%UntrackAction_label"
-               class="org.spearce.egit.ui.internal.actions.Untrack"
+               class="org.eclipse.egit.ui.internal.actions.Untrack"
                tooltip="%UntrackAction_tooltip"
                menubarPath="team.main/group1"
-               id="org.spearce.egit.ui.internal.actions.Untrack"/>   
+               id="org.eclipse.egit.ui.internal.actions.Untrack"/>   
          <action
                label="%TrackAction_label"
-               class="org.spearce.egit.ui.internal.actions.Track"
+               class="org.eclipse.egit.ui.internal.actions.Track"
                tooltip="%TrackAction_tooltip"
                menubarPath="team.main/group1"
-               id="org.spearce.egit.ui.internal.actions.Track"/>
+               id="org.eclipse.egit.ui.internal.actions.Track"/>
          <action
                label="%AssumeUnchangedAction_label"
-               class="org.spearce.egit.ui.internal.actions.AssumeUnchanged"
+               class="org.eclipse.egit.ui.internal.actions.AssumeUnchanged"
                tooltip="%AssumeUnchangedAction_tooltip"
                menubarPath="team.main/group1"
-               id="org.spearce.egit.ui.internal.actions.AssumeUnchanged"/>
+               id="org.eclipse.egit.ui.internal.actions.AssumeUnchanged"/>
          <action
-               class="org.spearce.egit.ui.internal.actions.ShowResourceInHistoryAction"
-               id="org.spearce.egit.ui.internal.actions.ShowResourceInHistoryAction"
+               class="org.eclipse.egit.ui.internal.actions.ShowResourceInHistoryAction"
+               id="org.eclipse.egit.ui.internal.actions.ShowResourceInHistoryAction"
                label="%ShowResourceInHistoryAction_label"
                menubarPath="team.main/group1"
                tooltip="%ShowResourceInHistoryAction_tooltip"/>
          <action
-               class="org.spearce.egit.ui.internal.actions.Update"
-               id="org.spearce.egit.ui.internal.actions.Update"
+               class="org.eclipse.egit.ui.internal.actions.Update"
+               id="org.eclipse.egit.ui.internal.actions.Update"
                label="%UpdateAction_label"
                menubarPath="team.main/group1"
                tooltip="%UpdateAction_tooltip"/>
          <action
-               class="org.spearce.egit.ui.internal.actions.CommitAction"
-               id="org.spearce.egit.ui.internal.actions.CommitAction"
+               class="org.eclipse.egit.ui.internal.actions.CommitAction"
+               id="org.eclipse.egit.ui.internal.actions.CommitAction"
                label="%CommitAction_label"
                menubarPath="team.main/group1"
                tooltip="%CommitAction_tooltip"/>
 	 <action
-	       class="org.spearce.egit.ui.internal.actions.CompareWithIndexAction"
-	       id="org.spearce.egit.ui.internal.actions.CompareWithIndexAction"
+	       class="org.eclipse.egit.ui.internal.actions.CompareWithIndexAction"
+	       id="org.eclipse.egit.ui.internal.actions.CompareWithIndexAction"
 	       label="%CompareWithIndexAction_label"
 	       menubarPath="compareWithMenu/gitCompareWithGroup"
 	       tooltip="&amp;CompareWithIndexAction_tooltip">
 	 </action>
 	  </objectContribution>
 	  <objectContribution
-         id="org.spearce.egit.ui.resetto"
-         objectClass="org.spearce.jgit.revwalk.RevCommit">
+         id="org.eclipse.egit.ui.resetto"
+         objectClass="org.eclipse.jgit.revwalk.RevCommit">
          <action
-               class="org.spearce.egit.ui.internal.actions.SoftResetToRevisionAction"
-               id="org.spearce.egit.ui.softresettorevision"
+               class="org.eclipse.egit.ui.internal.actions.SoftResetToRevisionAction"
+               id="org.eclipse.egit.ui.softresettorevision"
                label="Soft Reset"
                menubarPath="additions"
                enablesFor="1"
                tooltip="Resets HEAD but not working directory nor index">
          </action>
          <action
-               class="org.spearce.egit.ui.internal.actions.MixedResetToRevisionAction"
-               id="org.spearce.egit.ui.mixedresettorevision"
+               class="org.eclipse.egit.ui.internal.actions.MixedResetToRevisionAction"
+               id="org.eclipse.egit.ui.mixedresettorevision"
                label="Mixed Reset"
                menubarPath="additions"
                enablesFor="1"
                tooltip="Resets HEAD and index, but not working directory">
          </action>
          <action
-               class="org.spearce.egit.ui.internal.actions.HardResetToRevisionAction"
-               id="org.spearce.egit.ui.hardresettorevision"
+               class="org.eclipse.egit.ui.internal.actions.HardResetToRevisionAction"
+               id="org.eclipse.egit.ui.hardresettorevision"
                label="Hard Reset"
                menubarPath="additions"
                enablesFor="1"
                tooltip="Resets HEAD and index, and working directory (changed in tracked files will be lost)">
          </action>
 	 <action
-	       class="org.spearce.egit.ui.internal.actions.SetQuickdiffBaselineAction"
+	       class="org.eclipse.egit.ui.internal.actions.SetQuickdiffBaselineAction"
 	       enablesFor="1"
-	       id="org.spearce.egit.ui.setquickdiffbaseline"
+	       id="org.eclipse.egit.ui.setquickdiffbaseline"
 	       label="Set as quickdiff baseline"
 	       menubarPath="additions">
 	 </action>
 	 <action
-	       class="org.spearce.egit.ui.internal.actions.ResetQuickdiffBaselineAction"
+	       class="org.eclipse.egit.ui.internal.actions.ResetQuickdiffBaselineAction"
 	       enablesFor="*"
-	       id="org.spearce.egit.ui.resetquickdiffbaseline"
+	       id="org.eclipse.egit.ui.resetquickdiffbaseline"
 	       label="Reset quickdiff baseline to HEAD"
 	       menubarPath="additions">
 	 </action>
 	 <action
-	       class="org.spearce.egit.ui.internal.actions.ResetQuickdiffBaselineHeadParentAction"
+	       class="org.eclipse.egit.ui.internal.actions.ResetQuickdiffBaselineHeadParentAction"
 	       enablesFor="*"
-	       id="org.spearce.egit.ui.resetquickdiffheadparentbaseline"
+	       id="org.eclipse.egit.ui.resetquickdiffheadparentbaseline"
 	       label="Reset quickdiff baseline to first parent of HEAD"
 	       menubarPath="additions">
 	 </action>
@@ -170,15 +170,15 @@
    <extension
          point="org.eclipse.core.runtime.adapters">
          <factory
-               adaptableType="org.spearce.egit.core.internal.storage.GitFileHistoryProvider"
-               class="org.spearce.egit.ui.internal.factories.GitAdapterFactory">
+               adaptableType="org.eclipse.egit.core.internal.storage.GitFileHistoryProvider"
+               class="org.eclipse.egit.ui.internal.factories.GitAdapterFactory">
             <adapter
                   type="org.eclipse.team.ui.history.IHistoryPageSource">
             </adapter>
          </factory>
          <factory
 	       adaptableType="org.eclipse.core.resources.IResource"
-               class="org.spearce.egit.ui.internal.factories.GitAdapterFactory">
+               class="org.eclipse.egit.ui.internal.factories.GitAdapterFactory">
             <adapter
                   type="org.eclipse.team.ui.history.IHistoryPageSource">
             </adapter>
@@ -188,31 +188,31 @@
    <extension point="org.eclipse.ui.preferencePages">
       <page name="%GitPreferences_name"
             category="org.eclipse.team.ui.TeamPreferences"
-            class="org.spearce.egit.ui.internal.preferences.GitPreferenceRoot"
-            id="org.spearce.egit.ui.GitPreferences" />
+            class="org.eclipse.egit.ui.internal.preferences.GitPreferenceRoot"
+            id="org.eclipse.egit.ui.GitPreferences" />
 
       <page name="%GitPreferences_HistoryPreferencePage_name"
-	    category="org.spearce.egit.ui.GitPreferences"
-            class="org.spearce.egit.ui.internal.preferences.HistoryPreferencePage"
-	    id="org.spearce.egit.ui.internal.preferences.HistoryPreferencePage" >
+	    category="org.eclipse.egit.ui.GitPreferences"
+            class="org.eclipse.egit.ui.internal.preferences.HistoryPreferencePage"
+	    id="org.eclipse.egit.ui.internal.preferences.HistoryPreferencePage" >
 	    <keywordReference
-		  id="org.spearce.egit.ui.keyword.git">
+		  id="org.eclipse.egit.ui.keyword.git">
 	    </keywordReference>
 	    </page>
       <page name="%GitPreferences_WindowCachePreferencePage_name"
-	    category="org.spearce.egit.ui.GitPreferences"
-            class="org.spearce.egit.ui.internal.preferences.WindowCachePreferencePage"
-	    id="org.spearce.egit.ui.internal.preferences.WindowCachePreferencePage" >
+	    category="org.eclipse.egit.ui.GitPreferences"
+            class="org.eclipse.egit.ui.internal.preferences.WindowCachePreferencePage"
+	    id="org.eclipse.egit.ui.internal.preferences.WindowCachePreferencePage" >
 	    <keywordReference
-		  id="org.spearce.egit.ui.keyword.git">
+		  id="org.eclipse.egit.ui.keyword.git">
 	    </keywordReference>
       </page>
 	  <page name="%GitPreferences_DecoratorPreferencePage_name"
-	    category="org.spearce.egit.ui.GitPreferences"
-            class="org.spearce.egit.ui.internal.preferences.GitDecoratorPreferencePage"
-	    id="org.spearce.egit.ui.internal.preferences.GitDecoratorPreferencePage" >
+	    category="org.eclipse.egit.ui.GitPreferences"
+            class="org.eclipse.egit.ui.internal.preferences.GitDecoratorPreferencePage"
+	    id="org.eclipse.egit.ui.internal.preferences.GitDecoratorPreferencePage" >
 	    <keywordReference
-		  id="org.spearce.egit.ui.keyword.git">
+		  id="org.eclipse.egit.ui.keyword.git">
 	    </keywordReference>
       </page>
    </extension>
@@ -220,25 +220,25 @@
    <extension point="org.eclipse.ui.propertyPages">
       <page
             name="%Git"
-            class="org.spearce.egit.ui.internal.preferences.GitProjectPropertyPage"
-            id="org.spearce.egit.ui.preferences.GitProjectPropertyPage">
+            class="org.eclipse.egit.ui.internal.preferences.GitProjectPropertyPage"
+            id="org.eclipse.egit.ui.preferences.GitProjectPropertyPage">
 	    <enabledWhen>
 		<adapt type="org.eclipse.core.resources.IProject">
 			<test
-		    property="projectPersistentProperty org.eclipse.team.core.repository" value="org.spearce.egit.core.GitProvider">
+		    property="projectPersistentProperty org.eclipse.team.core.repository" value="org.eclipse.egit.core.GitProvider">
 			</test>
 		</adapt>
 	    </enabledWhen>
          <filter
                name="projectPersistentProperty"
-               value="org.eclipse.team.core.repository=org.spearce.egit.core.GitProvider">
+               value="org.eclipse.team.core.repository=org.eclipse.egit.core.GitProvider">
          </filter>
       </page>
    </extension>
 
    <extension point="org.eclipse.ui.keywords">
 	  <keyword
-			id="org.spearce.egit.ui.keyword.git"
+			id="org.eclipse.egit.ui.keyword.git"
 			label="git">
 	  </keyword>
    </extension>
@@ -248,10 +248,10 @@
             lightweight="true"
             adaptable="true"
             label="%Decorator_name"
-            class="org.spearce.egit.ui.internal.decorators.GitLightweightDecorator"
+            class="org.eclipse.egit.ui.internal.decorators.GitLightweightDecorator"
             state="true"
             location="BOTTOM_RIGHT"
-            id="org.spearce.egit.ui.internal.decorators.GitLightweightDecorator">
+            id="org.eclipse.egit.ui.internal.decorators.GitLightweightDecorator">
             <enablement>
               <objectClass name="org.eclipse.core.resources.IResource"/>
             </enablement>
@@ -263,11 +263,11 @@
 
    <extension point="org.eclipse.ui.themes">
       <themeElementCategory
-            id="org.spearce.egit.ui.GitTheme"
+            id="org.eclipse.egit.ui.GitTheme"
             label="%Theme_label"/>
       <fontDefinition
-            id="org.spearce.egit.ui.CommitGraphNormalFont"
-            categoryId="org.spearce.egit.ui.GitTheme"
+            id="org.eclipse.egit.ui.CommitGraphNormalFont"
+            categoryId="org.eclipse.egit.ui.GitTheme"
             label="%Theme_CommitGraphNormalFont_label"
             defaultsTo="org.eclipse.jface.dialogfont">
          <description>
@@ -275,8 +275,8 @@
          </description>
       </fontDefinition>
       <fontDefinition
-            id="org.spearce.egit.ui.CommitGraphHighlightFont"
-            categoryId="org.spearce.egit.ui.GitTheme"
+            id="org.eclipse.egit.ui.CommitGraphHighlightFont"
+            categoryId="org.eclipse.egit.ui.GitTheme"
             label="%Theme_CommitGraphHighlightFont_label"
             defaultsTo="org.eclipse.jface.dialogfont">
          <description>
@@ -284,8 +284,8 @@
          </description>
       </fontDefinition>
       <fontDefinition
-            id="org.spearce.egit.ui.CommitMessageFont"
-            categoryId="org.spearce.egit.ui.GitTheme"
+            id="org.eclipse.egit.ui.CommitMessageFont"
+            categoryId="org.eclipse.egit.ui.GitTheme"
             label="%Theme_CommitMessageFont_label"
             defaultsTo="org.eclipse.jface.textfont">
          <description>
@@ -299,20 +299,20 @@
          point="org.eclipse.ui.workbench.texteditor.quickDiffReferenceProvider">
       <referenceprovider
             label="%GitRemoteQuickDiffProvider_label"
-            class="org.spearce.egit.ui.internal.decorators.GitQuickDiffProvider"
-            id="org.spearce.egit.ui.internal.decorators.GitQuickDiffProvider">
+            class="org.eclipse.egit.ui.internal.decorators.GitQuickDiffProvider"
+            id="org.eclipse.egit.ui.internal.decorators.GitQuickDiffProvider">
       </referenceprovider>
    </extension>
    <extension
 	 point="org.eclipse.ui.actionSets">
       <actionSet
 	    description="Common things to do with Git"
-	    id="org.spearce.egit.ui.gitaction"
+	    id="org.eclipse.egit.ui.gitaction"
 	    label="%GitActions_label"
 	    visible="false"
 	    >
 	    <menu
-           id="org.spearce.egit.ui.gitmenu"
+           id="org.eclipse.egit.ui.gitmenu"
            label="%GitMenu_label"
            path="additions"
            >
@@ -321,68 +321,68 @@
         </separator>
 	    </menu>
 		<action
-        class="org.spearce.egit.ui.internal.actions.FetchAction"
+        class="org.eclipse.egit.ui.internal.actions.FetchAction"
         disabledIcon="icons/toolbar/fetchd.png"
         icon="icons/toolbar/fetche.png"
-        id="org.spearce.egit.ui.actionfetch"
+        id="org.eclipse.egit.ui.actionfetch"
         label="%FetchAction_label"
-        menubarPath="org.spearce.egit.ui.gitmenu/repo"
+        menubarPath="org.eclipse.egit.ui.gitmenu/repo"
         style="push"
-        toolbarPath="org.spearce.egit.ui"
+        toolbarPath="org.eclipse.egit.ui"
         tooltip="%FetchAction_tooltip">
 		</action>
 		<action
-        class="org.spearce.egit.ui.internal.actions.PushAction"
+        class="org.eclipse.egit.ui.internal.actions.PushAction"
         disabledIcon="icons/toolbar/pushd.png"
         icon="icons/toolbar/pushe.png"
-        id="org.spearce.egit.ui.actionpush"
+        id="org.eclipse.egit.ui.actionpush"
         label="%PushAction_label"
-        menubarPath="org.spearce.egit.ui.gitmenu/repo"
+        menubarPath="org.eclipse.egit.ui.gitmenu/repo"
         style="push"
-        toolbarPath="org.spearce.egit.ui"
+        toolbarPath="org.eclipse.egit.ui"
         tooltip="%PushAction_tooltip">
 		</action>
 		<action
-		       class="org.spearce.egit.ui.internal.actions.BranchAction"
+		       class="org.eclipse.egit.ui.internal.actions.BranchAction"
 		       disabledIcon="icons/toolbar/checkoutd.png"
 		       icon="icons/toolbar/checkoute.png"
-		       id="org.spearce.egit.ui.actionbranch"
+		       id="org.eclipse.egit.ui.actionbranch"
 		       label="%BranchAction_label"
 		       style="push"
-		       menubarPath="org.spearce.egit.ui.gitmenu/repositoryGroup"
+		       menubarPath="org.eclipse.egit.ui.gitmenu/repositoryGroup"
 		       toolbarPath="Normal/additions"
 		       tooltip="%BranchAction_tooltip">
 		</action>
 		<action
-		       class="org.spearce.egit.ui.internal.actions.CommitAction"
+		       class="org.eclipse.egit.ui.internal.actions.CommitAction"
 		       disabledIcon="icons/toolbar/commitd.png"
 		       icon="icons/toolbar/commite.png"
-		       id="org.spearce.egit.ui.actioncommit"
+		       id="org.eclipse.egit.ui.actioncommit"
 		       label="%CommitAction_label"
 		       style="push"
-		       menubarPath="org.spearce.egit.ui.gitmenu/repositoryGroup"
+		       menubarPath="org.eclipse.egit.ui.gitmenu/repositoryGroup"
 		       toolbarPath="Normal/additions"
 		       tooltip="%CommitAction_tooltip">
 		</action>
 		<action
-		       class="org.spearce.egit.ui.internal.actions.ResetAction"
+		       class="org.eclipse.egit.ui.internal.actions.ResetAction"
 		       disabledIcon="icons/toolbar/resetd.png"
 		       icon="icons/toolbar/resete.png"
-		       id="org.spearce.egit.ui.actionreset"
+		       id="org.eclipse.egit.ui.actionreset"
 		       label="%ResetAction_label"
 		       style="push"
-		       menubarPath="org.spearce.egit.ui.gitmenu/repositoryGroup"
+		       menubarPath="org.eclipse.egit.ui.gitmenu/repositoryGroup"
 		       toolbarPath="Normal/additions"
 		       tooltip="%ResetAction_tooltip">
 		</action>
 		<action
-		       class="org.spearce.egit.ui.internal.actions.Track"
+		       class="org.eclipse.egit.ui.internal.actions.Track"
 		       disabledIcon="icons/toolbar/trackd.png"
 		       icon="icons/toolbar/tracke.png"
-		       id="org.spearce.egit.ui.trackaction"
+		       id="org.eclipse.egit.ui.trackaction"
 		       label="%TrackAction_label"
 		       style="push"
-		       menubarPath="org.spearce.egit.ui.gitmenu/repositoryGroup"
+		       menubarPath="org.eclipse.egit.ui.gitmenu/repositoryGroup"
 		       toolbarPath="Normal/additions"
 		       tooltip="%TrackAction_tooltip">
 		</action>
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/Activator.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/Activator.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java
index b6aa512..eae507f 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/Activator.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui;
+package org.eclipse.egit.ui;
 
 import java.net.Authenticator;
 import java.net.ProxySelector;
@@ -29,6 +29,7 @@
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.core.runtime.jobs.ISchedulingRule;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.egit.core.project.RepositoryMapping;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.jsch.core.IJSchService;
@@ -38,7 +39,6 @@
 import org.eclipse.ui.themes.ITheme;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
-import org.spearce.egit.core.project.RepositoryMapping;
 import org.spearce.jgit.lib.IndexChangedEvent;
 import org.spearce.jgit.lib.RefsChangedEvent;
 import org.spearce.jgit.lib.Repository;
@@ -64,7 +64,7 @@
 	/**
 	 * Property constant indicating the decorator configuration has changed.
 	 */
-	public static final String DECORATORS_CHANGED = "org.spearce.egit.ui.DECORATORS_CHANGED"; //$NON-NLS-1$
+	public static final String DECORATORS_CHANGED = "org.eclipse.egit.ui.DECORATORS_CHANGED"; //$NON-NLS-1$
 
 	/**
 	 * @return the {@link Activator} singleton.
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/EclipseAuthenticator.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/EclipseAuthenticator.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/EclipseAuthenticator.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/EclipseAuthenticator.java
index 49aa0a0..55e0205 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/EclipseAuthenticator.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/EclipseAuthenticator.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui;
+package org.eclipse.egit.ui;
 
 import java.net.Authenticator;
 import java.net.InetAddress;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/EclipseProxySelector.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/EclipseProxySelector.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/EclipseProxySelector.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/EclipseProxySelector.java
index a9d5829..d51688d 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/EclipseProxySelector.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/EclipseProxySelector.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui;
+package org.eclipse.egit.ui;
 
 import java.io.IOException;
 import java.net.InetAddress;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/EclipseSshSessionFactory.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/EclipseSshSessionFactory.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/EclipseSshSessionFactory.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/EclipseSshSessionFactory.java
index 04600ea..7c05b1a 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/EclipseSshSessionFactory.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/EclipseSshSessionFactory.java
@@ -7,7 +7,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui;
+package org.eclipse.egit.ui;
 
 import org.eclipse.jsch.core.IJSchService;
 import org.eclipse.jsch.ui.UserInfoPrompter;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/GitHistoryPageSource.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/GitHistoryPageSource.java
similarity index 90%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/GitHistoryPageSource.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/GitHistoryPageSource.java
index df8ae08..d675351 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/GitHistoryPageSource.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/GitHistoryPageSource.java
@@ -6,13 +6,13 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui;
+package org.eclipse.egit.ui;
 
 import org.eclipse.core.resources.IResource;
+import org.eclipse.egit.core.ResourceList;
+import org.eclipse.egit.ui.internal.history.GitHistoryPage;
 import org.eclipse.team.ui.history.HistoryPageSource;
 import org.eclipse.ui.part.Page;
-import org.spearce.egit.core.ResourceList;
-import org.spearce.egit.ui.internal.history.GitHistoryPage;
 
 /**
  * A helper class for constructing the {@link GitHistoryPage}.
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/PluginPreferenceInitializer.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/PluginPreferenceInitializer.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java
index 8d617e9..82fb770 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/PluginPreferenceInitializer.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui;
+package org.eclipse.egit.ui;
 
 import org.eclipse.core.runtime.Preferences;
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIIcons.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIIcons.java
similarity index 99%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/UIIcons.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIIcons.java
index 952816c..6ad0654 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIIcons.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIIcons.java
@@ -7,7 +7,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui;
+package org.eclipse.egit.ui;
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIPreferences.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java
similarity index 94%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/UIPreferences.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java
index bbc36be..ed3a2e2 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIPreferences.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java
@@ -7,7 +7,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui;
+package org.eclipse.egit.ui;
 
 import org.eclipse.core.runtime.Preferences;
 
@@ -46,11 +46,11 @@
 	public final static String FINDTOOLBAR_FIND_IN = "findtoolbar_find_in";
 
 	/** */
-	public final static String THEME_CommitGraphNormalFont = "org.spearce.egit.ui.CommitGraphNormalFont";
+	public final static String THEME_CommitGraphNormalFont = "org.eclipse.egit.ui.CommitGraphNormalFont";
 	/** */
-	public final static String THEME_CommitGraphHighlightFont = "org.spearce.egit.ui.CommitGraphHighlightFont";
+	public final static String THEME_CommitGraphHighlightFont = "org.eclipse.egit.ui.CommitGraphHighlightFont";
 	/** */
-	public final static String THEME_CommitMessageFont = "org.spearce.egit.ui.CommitMessageFont";
+	public final static String THEME_CommitMessageFont = "org.eclipse.egit.ui.CommitMessageFont";
 
 	/** */
 	public final static String DECORATOR_RECOMPUTE_ANCESTORS = "decorator_recompute_ancestors";
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
similarity index 99%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
index 654e155..1f1149b 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
@@ -7,7 +7,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui;
+package org.eclipse.egit.ui;
 
 import org.eclipse.osgi.util.NLS;
 
@@ -1058,6 +1058,6 @@
 	public static String DecoratorPreferencesPage_iconsShowAssumeValid;
 
 	static {
-		initializeMessages("org.spearce.egit.ui.uitext", UIText.class);
+		initializeMessages("org.eclipse.egit.ui.uitext", UIText.class);
 	}
 }
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/EditableRevision.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/EditableRevision.java
similarity index 99%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/EditableRevision.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/EditableRevision.java
index ee064ef..c8fc2d5 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/EditableRevision.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/EditableRevision.java
@@ -35,7 +35,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.spearce.egit.ui.internal;
+package org.eclipse.egit.ui.internal;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/GitCompareFileRevisionEditorInput.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/GitCompareFileRevisionEditorInput.java
similarity index 99%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/GitCompareFileRevisionEditorInput.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/GitCompareFileRevisionEditorInput.java
index 88c867d..70e11f8 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/GitCompareFileRevisionEditorInput.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/GitCompareFileRevisionEditorInput.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal;
+package org.eclipse.egit.ui.internal;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -26,6 +26,7 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.egit.core.Activator;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.team.internal.core.history.LocalFileRevision;
 import org.eclipse.team.internal.ui.TeamUIMessages;
@@ -35,7 +36,6 @@
 import org.eclipse.team.internal.ui.synchronize.LocalResourceTypedElement;
 import org.eclipse.team.ui.synchronize.SaveableCompareEditorInput;
 import org.eclipse.ui.IWorkbenchPage;
-import org.spearce.egit.core.Activator;
 
 /**
  * The input provider for the compare editor when working on resources
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/GitResourceNode.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/GitResourceNode.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/GitResourceNode.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/GitResourceNode.java
index 3e8aa8b..97d83ed 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/GitResourceNode.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/GitResourceNode.java
@@ -7,7 +7,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal;
+package org.eclipse.egit.ui.internal;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/SWTUtils.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/SWTUtils.java
similarity index 99%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/SWTUtils.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/SWTUtils.java
index 8ebec05..976bc06 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/SWTUtils.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/SWTUtils.java
@@ -9,7 +9,7 @@
  *	 IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package org.spearce.egit.ui.internal;
+package org.eclipse.egit.ui.internal;
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.dialogs.Dialog;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/AbstractOperationAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AbstractOperationAction.java
similarity index 96%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/AbstractOperationAction.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AbstractOperationAction.java
index 52f60f5..b5de75a 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/AbstractOperationAction.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AbstractOperationAction.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collections;
@@ -17,6 +17,8 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIText;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -25,8 +27,6 @@
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIText;
 
 /**
  * Common functionality for EGit operations.
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/AbstractRevObjectAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AbstractRevObjectAction.java
similarity index 89%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/AbstractRevObjectAction.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AbstractRevObjectAction.java
index b7f4285..10ae3fd 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/AbstractRevObjectAction.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AbstractRevObjectAction.java
@@ -5,9 +5,9 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
-import org.spearce.egit.ui.internal.history.RevObjectSelectionProvider;
+import org.eclipse.egit.ui.internal.history.RevObjectSelectionProvider;
 import org.spearce.jgit.lib.Repository;
 
 abstract class AbstractRevObjectAction extends AbstractOperationAction {
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/AbstractRevObjectOperation.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AbstractRevObjectOperation.java
similarity index 94%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/AbstractRevObjectOperation.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AbstractRevObjectOperation.java
index 0c5d570..a107ea5 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/AbstractRevObjectOperation.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AbstractRevObjectOperation.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.spearce.jgit.lib.Repository;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/AssumeUnchanged.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AssumeUnchanged.java
similarity index 90%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/AssumeUnchanged.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AssumeUnchanged.java
index 38148b2..b2dfe72 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/AssumeUnchanged.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AssumeUnchanged.java
@@ -6,13 +6,13 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.util.List;
 
 import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.egit.core.op.AssumeUnchangedOperation;
 import org.eclipse.jface.action.IAction;
-import org.spearce.egit.core.op.AssumeUnchangedOperation;
 
 /**
  * This operation sets the assume-valid bit in the index for the
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/BranchAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/BranchAction.java
similarity index 91%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/BranchAction.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/BranchAction.java
index 38ee3d8..43cc730 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/BranchAction.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/BranchAction.java
@@ -7,20 +7,20 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.lang.reflect.InvocationTargetException;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.egit.core.op.BranchOperation;
+import org.eclipse.egit.ui.internal.decorators.GitLightweightDecorator;
+import org.eclipse.egit.ui.internal.dialogs.BranchSelectionDialog;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.swt.widgets.Display;
-import org.spearce.egit.core.op.BranchOperation;
-import org.spearce.egit.ui.internal.decorators.GitLightweightDecorator;
-import org.spearce.egit.ui.internal.dialogs.BranchSelectionDialog;
 import org.spearce.jgit.lib.Repository;
 
 /**
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CommitAction.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CommitAction.java
index 8415002..025366c 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CommitAction.java
@@ -9,7 +9,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.io.File;
 import java.io.IOException;
@@ -23,14 +23,14 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
+import org.eclipse.egit.core.project.GitProjectData;
+import org.eclipse.egit.core.project.RepositoryMapping;
+import org.eclipse.egit.ui.internal.dialogs.CommitDialog;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.team.core.TeamException;
 import org.eclipse.team.internal.ui.Utils;
-import org.spearce.egit.core.project.GitProjectData;
-import org.spearce.egit.core.project.RepositoryMapping;
-import org.spearce.egit.ui.internal.dialogs.CommitDialog;
 import org.spearce.jgit.lib.Commit;
 import org.spearce.jgit.lib.Constants;
 import org.spearce.jgit.lib.GitIndex;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CompareWithIndexAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CompareWithIndexAction.java
similarity index 93%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CompareWithIndexAction.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CompareWithIndexAction.java
index a9ca251..cbd65e5 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CompareWithIndexAction.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CompareWithIndexAction.java
@@ -35,7 +35,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.io.File;
 import java.io.IOException;
@@ -46,14 +46,14 @@
 import org.eclipse.compare.ITypedElement;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
+import org.eclipse.egit.core.internal.storage.GitFileRevision;
+import org.eclipse.egit.core.project.RepositoryMapping;
+import org.eclipse.egit.ui.internal.EditableRevision;
+import org.eclipse.egit.ui.internal.GitCompareFileRevisionEditorInput;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.team.core.history.IFileRevision;
 import org.eclipse.team.internal.ui.Utils;
 import org.eclipse.team.ui.synchronize.SaveableCompareEditorInput;
-import org.spearce.egit.core.internal.storage.GitFileRevision;
-import org.spearce.egit.core.project.RepositoryMapping;
-import org.spearce.egit.ui.internal.EditableRevision;
-import org.spearce.egit.ui.internal.GitCompareFileRevisionEditorInput;
 import org.spearce.jgit.lib.GitIndex;
 import org.spearce.jgit.lib.Repository;
 
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CompareWithRevisionAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CompareWithRevisionAction.java
similarity index 97%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CompareWithRevisionAction.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CompareWithRevisionAction.java
index 9fb10d6..f4c75e3 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CompareWithRevisionAction.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CompareWithRevisionAction.java
@@ -7,7 +7,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.util.Arrays;
 import java.util.Hashtable;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/Disconnect.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Disconnect.java
similarity index 85%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/Disconnect.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Disconnect.java
index 4201822..53ca5f3 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/Disconnect.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Disconnect.java
@@ -6,14 +6,14 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.util.List;
 
 import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.egit.core.op.DisconnectProviderOperation;
+import org.eclipse.egit.ui.internal.decorators.GitLightweightDecorator;
 import org.eclipse.jface.action.IAction;
-import org.spearce.egit.core.op.DisconnectProviderOperation;
-import org.spearce.egit.ui.internal.decorators.GitLightweightDecorator;
 
 /**
  *	Action to disassociate a project from its Git repository.
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/FetchAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/FetchAction.java
similarity index 90%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/FetchAction.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/FetchAction.java
index 582cb46..7bcddfe 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/FetchAction.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/FetchAction.java
@@ -5,18 +5,18 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.net.URISyntaxException;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIText;
+import org.eclipse.egit.ui.internal.fetch.FetchWizard;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.wizard.WizardDialog;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIText;
-import org.spearce.egit.ui.internal.fetch.FetchWizard;
 import org.spearce.jgit.lib.Repository;
 
 /**
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/HardResetToRevisionAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/HardResetToRevisionAction.java
similarity index 90%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/HardResetToRevisionAction.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/HardResetToRevisionAction.java
index f787e38..d6aac34 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/HardResetToRevisionAction.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/HardResetToRevisionAction.java
@@ -5,13 +5,13 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.util.List;
 
 import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.egit.core.op.ResetOperation;
 import org.eclipse.jface.action.IAction;
-import org.spearce.egit.core.op.ResetOperation;
 import org.spearce.jgit.lib.AnyObjectId;
 
 /**
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/MixedResetToRevisionAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/MixedResetToRevisionAction.java
similarity index 90%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/MixedResetToRevisionAction.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/MixedResetToRevisionAction.java
index 9d8bde0..34feade 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/MixedResetToRevisionAction.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/MixedResetToRevisionAction.java
@@ -5,13 +5,13 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.util.List;
 
 import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.egit.core.op.ResetOperation;
 import org.eclipse.jface.action.IAction;
-import org.spearce.egit.core.op.ResetOperation;
 import org.spearce.jgit.lib.AnyObjectId;
 
 /**
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/PushAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PushAction.java
similarity index 89%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/PushAction.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PushAction.java
index b4af3b5..422d6b6 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/PushAction.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PushAction.java
@@ -5,18 +5,18 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.net.URISyntaxException;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIText;
+import org.eclipse.egit.ui.internal.push.PushWizard;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.wizard.WizardDialog;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIText;
-import org.spearce.egit.ui.internal.push.PushWizard;
 import org.spearce.jgit.lib.Repository;
 
 /**
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/QuickdiffBaselineOperation.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/QuickdiffBaselineOperation.java
similarity index 89%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/QuickdiffBaselineOperation.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/QuickdiffBaselineOperation.java
index 8123863..e2f7cee 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/QuickdiffBaselineOperation.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/QuickdiffBaselineOperation.java
@@ -5,14 +5,14 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.io.IOException;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.internal.decorators.GitQuickDiffProvider;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.internal.decorators.GitQuickDiffProvider;
 import org.spearce.jgit.lib.Repository;
 
 /**
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/RepositoryAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/RepositoryAction.java
similarity index 97%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/RepositoryAction.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/RepositoryAction.java
index 362437e..443e30e 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/RepositoryAction.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/RepositoryAction.java
@@ -7,7 +7,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -15,10 +15,10 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.egit.core.project.RepositoryMapping;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.team.internal.ui.actions.TeamAction;
-import org.spearce.egit.core.project.RepositoryMapping;
 import org.spearce.jgit.lib.Repository;
 
 /**
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/ResetAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ResetAction.java
similarity index 90%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/ResetAction.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ResetAction.java
index a329925..1674500 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/ResetAction.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ResetAction.java
@@ -7,20 +7,20 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.lang.reflect.InvocationTargetException;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.egit.core.op.ResetOperation;
+import org.eclipse.egit.core.op.ResetOperation.ResetType;
+import org.eclipse.egit.ui.internal.decorators.GitLightweightDecorator;
+import org.eclipse.egit.ui.internal.dialogs.BranchSelectionDialog;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.spearce.egit.core.op.ResetOperation;
-import org.spearce.egit.core.op.ResetOperation.ResetType;
-import org.spearce.egit.ui.internal.decorators.GitLightweightDecorator;
-import org.spearce.egit.ui.internal.dialogs.BranchSelectionDialog;
 import org.spearce.jgit.lib.Repository;
 
 /**
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/ResetQuickdiffBaselineAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ResetQuickdiffBaselineAction.java
similarity index 95%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/ResetQuickdiffBaselineAction.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ResetQuickdiffBaselineAction.java
index d7097ba..438d532 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/ResetQuickdiffBaselineAction.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ResetQuickdiffBaselineAction.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.util.List;
 
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/ResetQuickdiffBaselineHeadParentAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ResetQuickdiffBaselineHeadParentAction.java
similarity index 95%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/ResetQuickdiffBaselineHeadParentAction.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ResetQuickdiffBaselineHeadParentAction.java
index 85a9998..d3bc80d 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/ResetQuickdiffBaselineHeadParentAction.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ResetQuickdiffBaselineHeadParentAction.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.util.List;
 
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/SetQuickdiffBaselineAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SetQuickdiffBaselineAction.java
similarity index 95%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/SetQuickdiffBaselineAction.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SetQuickdiffBaselineAction.java
index b5ac2b8..c623fdc 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/SetQuickdiffBaselineAction.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SetQuickdiffBaselineAction.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.util.List;
 
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/ShowResourceInHistoryAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ShowResourceInHistoryAction.java
similarity index 94%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/ShowResourceInHistoryAction.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ShowResourceInHistoryAction.java
index 0e7f846..3f5912a 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/ShowResourceInHistoryAction.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ShowResourceInHistoryAction.java
@@ -8,14 +8,14 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
+import org.eclipse.egit.core.ResourceList;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.team.internal.ui.actions.TeamAction;
 import org.eclipse.team.ui.TeamUI;
 import org.eclipse.team.ui.history.HistoryPageSaveablePart;
-import org.spearce.egit.core.ResourceList;
 
 /**
  * An action to update the history view for the selected
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/SoftResetToRevisionAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SoftResetToRevisionAction.java
similarity index 90%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/SoftResetToRevisionAction.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SoftResetToRevisionAction.java
index 7d7ff7a..a59c05f 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/SoftResetToRevisionAction.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SoftResetToRevisionAction.java
@@ -5,13 +5,13 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.util.List;
 
 import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.egit.core.op.ResetOperation;
 import org.eclipse.jface.action.IAction;
-import org.spearce.egit.core.op.ResetOperation;
 import org.spearce.jgit.lib.AnyObjectId;
 
 /**
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/Track.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Track.java
similarity index 95%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/Track.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Track.java
index e4de70c..6e0e749 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/Track.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Track.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
@@ -14,10 +14,10 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.egit.core.op.TrackOperation;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.spearce.egit.core.op.TrackOperation;
 
 /**
  * An action to add resources to the Git repository.
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/Untrack.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Untrack.java
similarity index 91%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/Untrack.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Untrack.java
index 222a8f7..d4f4ec7 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/Untrack.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Untrack.java
@@ -6,13 +6,13 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.util.List;
 
 import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.egit.core.op.UntrackOperation;
 import org.eclipse.jface.action.IAction;
-import org.spearce.egit.core.op.UntrackOperation;
 
 /**
  * An action to remove files from a Git repository. The removal does not alter
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/Update.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Update.java
similarity index 90%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/Update.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Update.java
index 4a16da3..2a8c274 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/Update.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Update.java
@@ -6,13 +6,13 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.actions;
+package org.eclipse.egit.ui.internal.actions;
 
 import java.util.List;
 
 import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.egit.core.op.UpdateOperation;
 import org.eclipse.jface.action.IAction;
-import org.spearce.egit.core.op.UpdateOperation;
 
 /**
  * Action to update index for selected resources with content from workdir.
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/CloneDestinationPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/CloneDestinationPage.java
similarity index 97%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/CloneDestinationPage.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/CloneDestinationPage.java
index 16f9773..0d5ec7c 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/CloneDestinationPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/CloneDestinationPage.java
@@ -8,12 +8,16 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.clone;
+package org.eclipse.egit.ui.internal.clone;
 
 import java.io.File;
 import java.util.List;
 
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.egit.ui.UIText;
+import org.eclipse.egit.ui.internal.components.RepositorySelection;
+import org.eclipse.egit.ui.internal.components.RepositorySelectionPage;
+import org.eclipse.egit.ui.internal.components.SelectionChangeListener;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
@@ -30,10 +34,6 @@
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
-import org.spearce.egit.ui.UIText;
-import org.spearce.egit.ui.internal.components.RepositorySelection;
-import org.spearce.egit.ui.internal.components.RepositorySelectionPage;
-import org.spearce.egit.ui.internal.components.SelectionChangeListener;
 import org.spearce.jgit.lib.Constants;
 import org.spearce.jgit.lib.Ref;
 
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/GitCloneWizard.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitCloneWizard.java
similarity index 95%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/GitCloneWizard.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitCloneWizard.java
index 114467f..a8d65f2 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/GitCloneWizard.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitCloneWizard.java
@@ -8,7 +8,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.clone;
+package org.eclipse.egit.ui.internal.clone;
 
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
@@ -18,6 +18,11 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.egit.core.op.CloneOperation;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIIcons;
+import org.eclipse.egit.ui.UIText;
+import org.eclipse.egit.ui.internal.components.RepositorySelectionPage;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -26,11 +31,6 @@
 import org.eclipse.ui.IImportWizard;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
-import org.spearce.egit.core.op.CloneOperation;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIIcons;
-import org.spearce.egit.ui.UIText;
-import org.spearce.egit.ui.internal.components.RepositorySelectionPage;
 import org.spearce.jgit.lib.Ref;
 import org.spearce.jgit.transport.URIish;
 
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/GitProjectsImportPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitProjectsImportPage.java
similarity index 99%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/GitProjectsImportPage.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitProjectsImportPage.java
index 8e02cd1..82e5eaf 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/GitProjectsImportPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitProjectsImportPage.java
@@ -1,4 +1,4 @@
-package org.spearce.egit.ui.internal.clone;
+package org.eclipse.egit.ui.internal.clone;
 
 /*******************************************************************************
  * Copyright (c) 2004, 2008 IBM Corporation and others.
@@ -34,6 +34,9 @@
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.egit.core.op.ConnectProviderOperation;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIText;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -60,9 +63,6 @@
 import org.eclipse.ui.internal.wizards.datatransfer.WizardProjectsImportPage;
 import org.eclipse.ui.statushandlers.StatusManager;
 import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-import org.spearce.egit.core.op.ConnectProviderOperation;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIText;
 
 /**
  * The GitWizardProjectsImportPage is the page that allows the user to import
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/SourceBranchPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/SourceBranchPage.java
similarity index 95%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/SourceBranchPage.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/SourceBranchPage.java
index f131d93..372cc4e 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/SourceBranchPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/SourceBranchPage.java
@@ -7,7 +7,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.clone;
+package org.eclipse.egit.ui.internal.clone;
 
 import java.io.File;
 import java.io.IOException;
@@ -19,6 +19,13 @@
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.egit.core.op.ListRemoteOperation;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIText;
+import org.eclipse.egit.ui.internal.components.BaseWizardPage;
+import org.eclipse.egit.ui.internal.components.RepositorySelection;
+import org.eclipse.egit.ui.internal.components.RepositorySelectionPage;
+import org.eclipse.egit.ui.internal.components.SelectionChangeListener;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
@@ -32,13 +39,6 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableItem;
-import org.spearce.egit.core.op.ListRemoteOperation;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIText;
-import org.spearce.egit.ui.internal.components.BaseWizardPage;
-import org.spearce.egit.ui.internal.components.RepositorySelection;
-import org.spearce.egit.ui.internal.components.RepositorySelectionPage;
-import org.spearce.egit.ui.internal.components.SelectionChangeListener;
 import org.spearce.jgit.lib.Constants;
 import org.spearce.jgit.lib.Ref;
 import org.spearce.jgit.lib.Repository;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/BaseWizardPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/BaseWizardPage.java
similarity index 97%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/BaseWizardPage.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/BaseWizardPage.java
index eed4fc8..80d7334 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/BaseWizardPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/BaseWizardPage.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.components;
+package org.eclipse.egit.ui.internal.components;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/CenteredImageLabelProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/CenteredImageLabelProvider.java
similarity index 97%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/CenteredImageLabelProvider.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/CenteredImageLabelProvider.java
index 8752a60..4a753f9 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/CenteredImageLabelProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/CenteredImageLabelProvider.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.components;
+package org.eclipse.egit.ui.internal.components;
 
 import org.eclipse.jface.viewers.OwnerDrawLabelProvider;
 import org.eclipse.swt.graphics.Image;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/CheckboxLabelProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/CheckboxLabelProvider.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/CheckboxLabelProvider.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/CheckboxLabelProvider.java
index 75970ea..68081d9 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/CheckboxLabelProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/CheckboxLabelProvider.java
@@ -5,9 +5,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.components;
+package org.eclipse.egit.ui.internal.components;
 
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.egit.ui.UIIcons;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
@@ -17,7 +18,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
-import org.spearce.egit.ui.UIIcons;
 
 /**
  * Label provider displaying native check boxes images for boolean values.
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/ClickableCellEditor.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/ClickableCellEditor.java
similarity index 97%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/ClickableCellEditor.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/ClickableCellEditor.java
index de22195..dbfe044 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/ClickableCellEditor.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/ClickableCellEditor.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.components;
+package org.eclipse.egit.ui.internal.components;
 
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/ComboLabelingSupport.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/ComboLabelingSupport.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/ComboLabelingSupport.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/ComboLabelingSupport.java
index 292ed29..76fae84 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/ComboLabelingSupport.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/ComboLabelingSupport.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.components;
+package org.eclipse.egit.ui.internal.components;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RefContentProposal.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefContentProposal.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RefContentProposal.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefContentProposal.java
index b63c428..bf556d3 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RefContentProposal.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefContentProposal.java
@@ -5,13 +5,13 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.components;
+package org.eclipse.egit.ui.internal.components;
 
 import java.io.IOException;
 import java.sql.Blob;
 
+import org.eclipse.egit.ui.Activator;
 import org.eclipse.jface.fieldassist.IContentProposal;
-import org.spearce.egit.ui.Activator;
 import org.spearce.jgit.lib.Commit;
 import org.spearce.jgit.lib.Constants;
 import org.spearce.jgit.lib.ObjectId;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RefSpecPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefSpecPage.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RefSpecPage.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefSpecPage.java
index 586e5d9..cb33ff1 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RefSpecPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefSpecPage.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.components;
+package org.eclipse.egit.ui.internal.components;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -14,6 +14,9 @@
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.egit.core.op.ListRemoteOperation;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIText;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
@@ -24,9 +27,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Group;
-import org.spearce.egit.core.op.ListRemoteOperation;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIText;
 import org.spearce.jgit.lib.Repository;
 import org.spearce.jgit.transport.RefSpec;
 import org.spearce.jgit.transport.TagOpt;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RefSpecPanel.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefSpecPanel.java
similarity index 99%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RefSpecPanel.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefSpecPanel.java
index a5a9529..c5d7a99 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RefSpecPanel.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefSpecPanel.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.components;
+package org.eclipse.egit.ui.internal.components;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -24,6 +24,9 @@
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIIcons;
+import org.eclipse.egit.ui.UIText;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.fieldassist.ComboContentAdapter;
 import org.eclipse.jface.fieldassist.ContentProposalAdapter;
@@ -72,9 +75,6 @@
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIIcons;
-import org.spearce.egit.ui.UIText;
 import org.spearce.jgit.lib.Constants;
 import org.spearce.jgit.lib.ObjectId;
 import org.spearce.jgit.lib.Ref;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RepositorySelection.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RepositorySelection.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RepositorySelection.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RepositorySelection.java
index d9aa6d5..4e76c8e 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RepositorySelection.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RepositorySelection.java
@@ -6,7 +6,7 @@
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
 
-package org.spearce.egit.ui.internal.components;
+package org.eclipse.egit.ui.internal.components;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RepositorySelectionPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RepositorySelectionPage.java
similarity index 99%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RepositorySelectionPage.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RepositorySelectionPage.java
index db177ec..2a206c9 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RepositorySelectionPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RepositorySelectionPage.java
@@ -8,7 +8,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.components;
+package org.eclipse.egit.ui.internal.components;
 
 import java.io.File;
 import java.net.URISyntaxException;
@@ -16,6 +16,8 @@
 import java.util.List;
 import java.util.regex.Pattern;
 
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIText;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
@@ -33,8 +35,6 @@
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIText;
 import org.spearce.jgit.transport.RemoteConfig;
 import org.spearce.jgit.transport.URIish;
 import org.spearce.jgit.util.FS;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/SelectionChangeListener.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/SelectionChangeListener.java
similarity index 93%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/SelectionChangeListener.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/SelectionChangeListener.java
index bde1d21..74bc06e 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/SelectionChangeListener.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/SelectionChangeListener.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.components;
+package org.eclipse.egit.ui.internal.components;
 
 /**
  * General interface for receivers of selection-changed notifications from
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/DecoratableResourceAdapter.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceAdapter.java
similarity index 96%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/DecoratableResourceAdapter.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceAdapter.java
index 12f7ec3..9f0025a 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/DecoratableResourceAdapter.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceAdapter.java
@@ -11,7 +11,7 @@
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
 
-package org.spearce.egit.ui.internal.decorators;
+package org.eclipse.egit.ui.internal.decorators;
 
 import java.io.File;
 import java.io.IOException;
@@ -21,14 +21,14 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.egit.core.AdaptableFileTreeIterator;
+import org.eclipse.egit.core.ContainerTreeIterator;
+import org.eclipse.egit.core.ContainerTreeIterator.ResourceEntry;
+import org.eclipse.egit.core.project.RepositoryMapping;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIPreferences;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.team.core.Team;
-import org.spearce.egit.core.AdaptableFileTreeIterator;
-import org.spearce.egit.core.ContainerTreeIterator;
-import org.spearce.egit.core.ContainerTreeIterator.ResourceEntry;
-import org.spearce.egit.core.project.RepositoryMapping;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIPreferences;
 import org.spearce.jgit.dircache.DirCache;
 import org.spearce.jgit.dircache.DirCacheEntry;
 import org.spearce.jgit.dircache.DirCacheIterator;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/GitDocument.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitDocument.java
similarity index 97%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/GitDocument.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitDocument.java
index 16f01ce..808e968 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/GitDocument.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitDocument.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.decorators;
+package org.eclipse.egit.ui.internal.decorators;
 
 import java.io.IOException;
 import java.util.Map;
@@ -15,11 +15,11 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.egit.core.GitProvider;
+import org.eclipse.egit.core.project.RepositoryMapping;
+import org.eclipse.egit.ui.Activator;
 import org.eclipse.jface.text.Document;
 import org.eclipse.team.core.RepositoryProvider;
-import org.spearce.egit.core.GitProvider;
-import org.spearce.egit.core.project.RepositoryMapping;
-import org.spearce.egit.ui.Activator;
 import org.spearce.jgit.lib.AnyObjectId;
 import org.spearce.jgit.lib.Commit;
 import org.spearce.jgit.lib.Constants;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/GitLightweightDecorator.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitLightweightDecorator.java
similarity index 96%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/GitLightweightDecorator.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitLightweightDecorator.java
index 6f69c80..81cf802 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/GitLightweightDecorator.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitLightweightDecorator.java
@@ -11,7 +11,7 @@
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
 
-package org.spearce.egit.ui.internal.decorators;
+package org.eclipse.egit.ui.internal.decorators;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -30,6 +30,16 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.egit.core.GitException;
+import org.eclipse.egit.core.internal.util.ExceptionCollector;
+import org.eclipse.egit.core.project.GitProjectData;
+import org.eclipse.egit.core.project.RepositoryChangeListener;
+import org.eclipse.egit.core.project.RepositoryMapping;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIIcons;
+import org.eclipse.egit.ui.UIPreferences;
+import org.eclipse.egit.ui.UIText;
+import org.eclipse.egit.ui.internal.decorators.IDecoratableResource.Staged;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.util.IPropertyChangeListener;
@@ -46,16 +56,6 @@
 import org.eclipse.team.ui.TeamUI;
 import org.eclipse.ui.IContributorResourceAdapter;
 import org.eclipse.ui.PlatformUI;
-import org.spearce.egit.core.GitException;
-import org.spearce.egit.core.internal.util.ExceptionCollector;
-import org.spearce.egit.core.project.GitProjectData;
-import org.spearce.egit.core.project.RepositoryChangeListener;
-import org.spearce.egit.core.project.RepositoryMapping;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIIcons;
-import org.spearce.egit.ui.UIPreferences;
-import org.spearce.egit.ui.UIText;
-import org.spearce.egit.ui.internal.decorators.IDecoratableResource.Staged;
 import org.spearce.jgit.lib.IndexChangedEvent;
 import org.spearce.jgit.lib.RefsChangedEvent;
 import org.spearce.jgit.lib.Repository;
@@ -79,7 +79,7 @@
 	 * Property constant pointing back to the extension point id of the
 	 * decorator
 	 */
-	public static final String DECORATOR_ID = "org.spearce.egit.ui.internal.decorators.GitLightweightDecorator"; //$NON-NLS-1$
+	public static final String DECORATOR_ID = "org.eclipse.egit.ui.internal.decorators.GitLightweightDecorator"; //$NON-NLS-1$
 
 	/**
 	 * Bit-mask describing interesting changes for IResourceChangeListener
@@ -591,7 +591,7 @@ public void refsChanged(RefsChangedEvent e) {
 	 * Callback for RepositoryChangeListener events, as well as
 	 * RepositoryListener events via repositoryChanged()
 	 *
-	 * @see org.spearce.egit.core.project.RepositoryChangeListener#repositoryChanged(org.spearce.egit.core.project.RepositoryMapping)
+	 * @see org.eclipse.egit.core.project.RepositoryChangeListener#repositoryChanged(org.eclipse.egit.core.project.RepositoryMapping)
 	 */
 	public void repositoryChanged(RepositoryMapping mapping) {
 		// Until we find a way to refresh visible labels within a project
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/GitQuickDiffProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitQuickDiffProvider.java
similarity index 95%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/GitQuickDiffProvider.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitQuickDiffProvider.java
index b2d48cd..d9dcf61 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/GitQuickDiffProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitQuickDiffProvider.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.decorators;
+package org.eclipse.egit.ui.internal.decorators;
 
 import java.io.IOException;
 import java.util.Map;
@@ -15,14 +15,14 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIText;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.team.core.RepositoryProvider;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.ide.ResourceUtil;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.eclipse.ui.texteditor.quickdiff.IQuickDiffReferenceProvider;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIText;
 import org.spearce.jgit.lib.Repository;
 
 /**
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/IDecoratableResource.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/IDecoratableResource.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/IDecoratableResource.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/IDecoratableResource.java
index 908c206..5b74688 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/IDecoratableResource.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/IDecoratableResource.java
@@ -6,7 +6,7 @@
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
 
-package org.spearce.egit.ui.internal.decorators;
+package org.eclipse.egit.ui.internal.decorators;
 
 import org.eclipse.core.resources.IResource;
 
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/BranchSelectionDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchSelectionDialog.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/BranchSelectionDialog.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchSelectionDialog.java
index 9aad95b..193eca9 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/BranchSelectionDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchSelectionDialog.java
@@ -8,13 +8,16 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.dialogs;
+package org.eclipse.egit.ui.internal.dialogs;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.eclipse.egit.core.op.ResetOperation.ResetType;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIText;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IInputValidator;
@@ -43,9 +46,6 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
-import org.spearce.egit.core.op.ResetOperation.ResetType;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIText;
 import org.spearce.jgit.lib.Constants;
 import org.spearce.jgit.lib.ObjectId;
 import org.spearce.jgit.lib.RefUpdate;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/CommitDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/CommitDialog.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java
index ce7196f..c56ae47 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/CommitDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java
@@ -9,7 +9,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.dialogs;
+package org.eclipse.egit.ui.internal.dialogs;
 
 import java.io.File;
 import java.io.IOException;
@@ -22,6 +22,12 @@
 import org.eclipse.compare.ITypedElement;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.egit.core.Activator;
+import org.eclipse.egit.core.GitProvider;
+import org.eclipse.egit.core.internal.storage.GitFileHistoryProvider;
+import org.eclipse.egit.core.project.RepositoryMapping;
+import org.eclipse.egit.ui.UIText;
+import org.eclipse.egit.ui.internal.GitCompareFileRevisionEditorInput;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -59,12 +65,6 @@
 import org.eclipse.team.core.history.IFileRevision;
 import org.eclipse.team.internal.ui.history.FileRevisionTypedElement;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.spearce.egit.core.Activator;
-import org.spearce.egit.core.GitProvider;
-import org.spearce.egit.core.internal.storage.GitFileHistoryProvider;
-import org.spearce.egit.core.project.RepositoryMapping;
-import org.spearce.egit.ui.UIText;
-import org.spearce.egit.ui.internal.GitCompareFileRevisionEditorInput;
 import org.spearce.jgit.lib.Commit;
 import org.spearce.jgit.lib.Constants;
 import org.spearce.jgit.lib.GitIndex;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/factories/GitAdapterFactory.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/factories/GitAdapterFactory.java
similarity index 92%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/factories/GitAdapterFactory.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/factories/GitAdapterFactory.java
index 53e303b..66e1cfd 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/factories/GitAdapterFactory.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/factories/GitAdapterFactory.java
@@ -6,11 +6,11 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.factories;
+package org.eclipse.egit.ui.internal.factories;
 
 import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.egit.ui.GitHistoryPageSource;
 import org.eclipse.team.ui.history.IHistoryPageSource;
-import org.spearce.egit.ui.GitHistoryPageSource;
 
 /**
  * This class is an intelligent "cast" operation for getting
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/fetch/FetchResultDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultDialog.java
similarity index 96%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/fetch/FetchResultDialog.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultDialog.java
index 4b52b8d..a7010eb 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/fetch/FetchResultDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultDialog.java
@@ -5,8 +5,9 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.fetch;
+package org.eclipse.egit.ui.internal.fetch;
 
+import org.eclipse.egit.ui.UIText;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.osgi.util.NLS;
@@ -16,7 +17,6 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
-import org.spearce.egit.ui.UIText;
 import org.spearce.jgit.lib.Repository;
 import org.spearce.jgit.transport.FetchResult;
 
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/fetch/FetchResultTable.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/fetch/FetchResultTable.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java
index f1169d1..36ba3e0 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/fetch/FetchResultTable.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java
@@ -1,5 +1,6 @@
-package org.spearce.egit.ui.internal.fetch;
+package org.eclipse.egit.ui.internal.fetch;
 
+import org.eclipse.egit.ui.UIText;
 import org.eclipse.jface.layout.TableColumnLayout;
 import org.eclipse.jface.resource.ColorRegistry;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
@@ -17,7 +18,6 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
-import org.spearce.egit.ui.UIText;
 import org.spearce.jgit.lib.Constants;
 import org.spearce.jgit.lib.RefUpdate;
 import org.spearce.jgit.lib.Repository;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/fetch/FetchWizard.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchWizard.java
similarity index 92%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/fetch/FetchWizard.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchWizard.java
index 2fa6828..f0e158d 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/fetch/FetchWizard.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchWizard.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.fetch;
+package org.eclipse.egit.ui.internal.fetch;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -16,6 +16,13 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.egit.core.EclipseGitProgressTransformer;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIIcons;
+import org.eclipse.egit.ui.UIText;
+import org.eclipse.egit.ui.internal.components.RefSpecPage;
+import org.eclipse.egit.ui.internal.components.RepositorySelection;
+import org.eclipse.egit.ui.internal.components.RepositorySelectionPage;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.wizard.IWizardPage;
@@ -23,13 +30,6 @@
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
-import org.spearce.egit.core.EclipseGitProgressTransformer;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIIcons;
-import org.spearce.egit.ui.UIText;
-import org.spearce.egit.ui.internal.components.RefSpecPage;
-import org.spearce.egit.ui.internal.components.RepositorySelection;
-import org.spearce.egit.ui.internal.components.RepositorySelectionPage;
 import org.spearce.jgit.errors.NotSupportedException;
 import org.spearce.jgit.errors.TransportException;
 import org.spearce.jgit.lib.Repository;
@@ -95,7 +95,7 @@ public boolean performFinish() {
 			ErrorDialog.openError(getShell(),
 					UIText.FetchWizard_transportNotSupportedTitle,
 					UIText.FetchWizard_transportNotSupportedMessage,
-					new Status(IStatus.ERROR, org.spearce.egit.ui.Activator
+					new Status(IStatus.ERROR, org.eclipse.egit.ui.Activator
 							.getPluginId(), e.getMessage(), e));
 			return false;
 		}
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/fetch/TrackingRefUpdateContentProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/TrackingRefUpdateContentProvider.java
similarity index 96%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/fetch/TrackingRefUpdateContentProvider.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/TrackingRefUpdateContentProvider.java
index 00cc5f1..ad21982 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/fetch/TrackingRefUpdateContentProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/TrackingRefUpdateContentProvider.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.fetch;
+package org.eclipse.egit.ui.internal.fetch;
 
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/CommitFileDiffViewer.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitFileDiffViewer.java
similarity index 95%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/CommitFileDiffViewer.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitFileDiffViewer.java
index ebec261..7f90b8b 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/CommitFileDiffViewer.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitFileDiffViewer.java
@@ -5,12 +5,15 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.history;
+package org.eclipse.egit.ui.internal.history;
 
 import java.util.Iterator;
 
 import org.eclipse.compare.CompareUI;
 import org.eclipse.compare.ITypedElement;
+import org.eclipse.egit.core.internal.storage.GitFileRevision;
+import org.eclipse.egit.ui.UIText;
+import org.eclipse.egit.ui.internal.GitCompareFileRevisionEditorInput;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.IOpenListener;
 import org.eclipse.jface.viewers.ISelection;
@@ -32,9 +35,6 @@
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.team.core.history.IFileRevision;
 import org.eclipse.team.internal.ui.history.FileRevisionTypedElement;
-import org.spearce.egit.core.internal.storage.GitFileRevision;
-import org.spearce.egit.ui.UIText;
-import org.spearce.egit.ui.internal.GitCompareFileRevisionEditorInput;
 import org.spearce.jgit.lib.Repository;
 import org.spearce.jgit.revwalk.RevCommit;
 import org.spearce.jgit.treewalk.TreeWalk;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/CommitGraphTable.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java
similarity index 97%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/CommitGraphTable.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java
index 2bccf99..b81aea5 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/CommitGraphTable.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java
@@ -8,10 +8,13 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.history;
+package org.eclipse.egit.ui.internal.history;
 
 import java.util.Iterator;
 
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIPreferences;
+import org.eclipse.egit.ui.UIText;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -38,9 +41,6 @@
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.Widget;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIPreferences;
-import org.spearce.egit.ui.UIText;
 import org.spearce.jgit.revplot.PlotCommit;
 import org.spearce.jgit.revwalk.RevCommit;
 import org.spearce.jgit.revwalk.RevFlag;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/CommitMessageViewer.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitMessageViewer.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/CommitMessageViewer.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitMessageViewer.java
index fc83782..a02116e 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/CommitMessageViewer.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitMessageViewer.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.history;
+package org.eclipse.egit.ui.internal.history;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -15,6 +15,8 @@
 import java.util.regex.Pattern;
 
 import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIPreferences;
 import org.eclipse.jface.text.DefaultTextDoubleClickStrategy;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
@@ -30,8 +32,6 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIPreferences;
 import org.spearce.jgit.lib.PersonIdent;
 import org.spearce.jgit.revplot.PlotCommit;
 import org.spearce.jgit.revwalk.RevCommit;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/CommitNavigationListener.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitNavigationListener.java
similarity index 93%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/CommitNavigationListener.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitNavigationListener.java
index db54791..178225c 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/CommitNavigationListener.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitNavigationListener.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.history;
+package org.eclipse.egit.ui.internal.history;
 
 import org.spearce.jgit.revwalk.RevCommit;
 
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FileDiff.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FileDiff.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java
index bd20b1f..e1a0b5d 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FileDiff.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.history;
+package org.eclipse.egit.ui.internal.history;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FileDiffContentProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiffContentProvider.java
similarity index 94%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FileDiffContentProvider.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiffContentProvider.java
index c84e9f3..4fae1b8 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FileDiffContentProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiffContentProvider.java
@@ -5,13 +5,13 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.history;
+package org.eclipse.egit.ui.internal.history;
 
 import java.io.IOException;
 
+import org.eclipse.egit.ui.Activator;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
-import org.spearce.egit.ui.Activator;
 import org.spearce.jgit.revwalk.RevCommit;
 import org.spearce.jgit.treewalk.TreeWalk;
 
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FileDiffLabelProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiffLabelProvider.java
similarity index 95%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FileDiffLabelProvider.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiffLabelProvider.java
index 60b3a5a..148e61d 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FileDiffLabelProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiffLabelProvider.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.history;
+package org.eclipse.egit.ui.internal.history;
 
 import org.eclipse.jface.viewers.BaseLabelProvider;
 import org.eclipse.jface.viewers.ITableLabelProvider;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FindResults.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FindResults.java
similarity index 99%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FindResults.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FindResults.java
index 9ae24cc..8af88da 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FindResults.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FindResults.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.history;
+package org.eclipse.egit.ui.internal.history;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FindToolbar.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FindToolbar.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FindToolbar.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FindToolbar.java
index 1747510..ae31df8 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FindToolbar.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FindToolbar.java
@@ -7,12 +7,16 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.history;
+package org.eclipse.egit.ui.internal.history;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.runtime.Preferences;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIIcons;
+import org.eclipse.egit.ui.UIPreferences;
+import org.eclipse.egit.ui.UIText;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
@@ -41,10 +45,6 @@
 import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.swt.widgets.ToolItem;
 import org.eclipse.swt.widgets.Widget;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIIcons;
-import org.spearce.egit.ui.UIPreferences;
-import org.spearce.egit.ui.UIText;
 import org.spearce.jgit.revwalk.RevFlag;
 
 /**
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FindToolbarThread.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FindToolbarThread.java
similarity index 99%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FindToolbarThread.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FindToolbarThread.java
index 60eaf72..76109dd 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FindToolbarThread.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FindToolbarThread.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.history;
+package org.eclipse.egit.ui.internal.history;
 
 /**
  * This class executes the search function for the find toolbar. Only one thread
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/GenerateHistoryJob.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GenerateHistoryJob.java
similarity index 94%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/GenerateHistoryJob.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GenerateHistoryJob.java
index 46d08d8..2710927 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/GenerateHistoryJob.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GenerateHistoryJob.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.history;
+package org.eclipse.egit.ui.internal.history;
 
 import java.io.IOException;
 
@@ -13,8 +13,8 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIText;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIText;
 
 class GenerateHistoryJob extends Job {
 	private static final int BATCH_SIZE = 256;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/GitHistoryPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/GitHistoryPage.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java
index 08887c8..ecbe0d4 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/GitHistoryPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.history;
+package org.eclipse.egit.ui.internal.history;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -19,6 +19,12 @@
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.jobs.JobChangeAdapter;
+import org.eclipse.egit.core.ResourceList;
+import org.eclipse.egit.core.project.RepositoryMapping;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIIcons;
+import org.eclipse.egit.ui.UIPreferences;
+import org.eclipse.egit.ui.UIText;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.IContributionItem;
@@ -54,12 +60,6 @@
 import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
 import org.eclipse.ui.part.IPageSite;
 import org.eclipse.ui.progress.IWorkbenchSiteProgressService;
-import org.spearce.egit.core.ResourceList;
-import org.spearce.egit.core.project.RepositoryMapping;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIIcons;
-import org.spearce.egit.ui.UIPreferences;
-import org.spearce.egit.ui.UIText;
 import org.spearce.jgit.lib.AnyObjectId;
 import org.spearce.jgit.lib.Constants;
 import org.spearce.jgit.lib.IndexChangedEvent;
@@ -92,7 +92,7 @@
 
 	private static final String SHOW_FIND_TOOLBAR = UIPreferences.RESOURCEHISTORY_SHOW_FINDTOOLBAR;
 
-	private static final String POPUP_ID = "org.spearce.egit.ui.historyPageContributions";
+	private static final String POPUP_ID = "org.eclipse.egit.ui.historyPageContributions";
 
 	/**
 	 * Determine if the input can be shown in this viewer.
@@ -193,7 +193,7 @@ private static boolean typeOk(final IResource object) {
 	 */
 	private RevObjectSelectionProvider revObjectSelectionProvider;
 
-	private static final String PREF_SHOWALLFILTER = "org.spearce.egit.ui.githistorypage.showallfilter"; //$NON-NLS-1$
+	private static final String PREF_SHOWALLFILTER = "org.eclipse.egit.ui.githistorypage.showallfilter"; //$NON-NLS-1$
 
 	enum ShowFilter {
 		SHOWALLRESOURCE,
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/GraphContentProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GraphContentProvider.java
similarity index 95%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/GraphContentProvider.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GraphContentProvider.java
index 2cd8ff4..0184777 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/GraphContentProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GraphContentProvider.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.history;
+package org.eclipse.egit.ui.internal.history;
 
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/GraphLabelProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GraphLabelProvider.java
similarity index 97%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/GraphLabelProvider.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GraphLabelProvider.java
index 29e2648..1990876 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/GraphLabelProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GraphLabelProvider.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.history;
+package org.eclipse.egit.ui.internal.history;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/RevObjectSelectionProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/RevObjectSelectionProvider.java
similarity index 97%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/RevObjectSelectionProvider.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/RevObjectSelectionProvider.java
index 46a091c..5e30e39 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/RevObjectSelectionProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/RevObjectSelectionProvider.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.history;
+package org.eclipse.egit.ui.internal.history;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/SWTCommit.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/SWTCommit.java
similarity index 94%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/SWTCommit.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/SWTCommit.java
index 2341fbd..7a8d808 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/SWTCommit.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/SWTCommit.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.history;
+package org.eclipse.egit.ui.internal.history;
 
 import org.eclipse.swt.widgets.Widget;
 import org.spearce.jgit.lib.AnyObjectId;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/SWTCommitList.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/SWTCommitList.java
similarity index 97%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/SWTCommitList.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/SWTCommitList.java
index d0b9c06..5382343 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/SWTCommitList.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/SWTCommitList.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.history;
+package org.eclipse.egit.ui.internal.history;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/SWTPlotRenderer.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/SWTPlotRenderer.java
similarity index 97%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/SWTPlotRenderer.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/SWTPlotRenderer.java
index b008df7..e4818a7 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/SWTPlotRenderer.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/SWTPlotRenderer.java
@@ -6,8 +6,9 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.history;
+package org.eclipse.egit.ui.internal.history;
 
+import org.eclipse.egit.ui.internal.history.SWTCommitList.SWTLane;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
@@ -16,7 +17,6 @@
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.ui.themes.ColorUtil;
-import org.spearce.egit.ui.internal.history.SWTCommitList.SWTLane;
 import org.spearce.jgit.lib.Constants;
 import org.spearce.jgit.lib.Ref;
 import org.spearce.jgit.revplot.AbstractPlotRenderer;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/SWTWalk.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/SWTWalk.java
similarity index 94%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/SWTWalk.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/SWTWalk.java
index 57039b5..131a66c 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/SWTWalk.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/SWTWalk.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.history;
+package org.eclipse.egit.ui.internal.history;
 
 import org.spearce.jgit.lib.AnyObjectId;
 import org.spearce.jgit.lib.Repository;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitDecoratorPreferencePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitDecoratorPreferencePage.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java
index 8e0ac4e..36eaece 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitDecoratorPreferencePage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.preferences;
+package org.eclipse.egit.ui.internal.preferences;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -19,6 +19,13 @@
 import java.util.Observer;
 
 import org.eclipse.core.resources.IResource;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIPreferences;
+import org.eclipse.egit.ui.UIText;
+import org.eclipse.egit.ui.internal.SWTUtils;
+import org.eclipse.egit.ui.internal.decorators.IDecoratableResource;
+import org.eclipse.egit.ui.internal.decorators.GitLightweightDecorator.DecorationHelper;
+import org.eclipse.egit.ui.internal.decorators.IDecoratableResource.Staged;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -70,13 +77,6 @@
 import org.eclipse.ui.dialogs.ListSelectionDialog;
 import org.eclipse.ui.ide.IDE.SharedImages;
 import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIPreferences;
-import org.spearce.egit.ui.UIText;
-import org.spearce.egit.ui.internal.SWTUtils;
-import org.spearce.egit.ui.internal.decorators.IDecoratableResource;
-import org.spearce.egit.ui.internal.decorators.GitLightweightDecorator.DecorationHelper;
-import org.spearce.egit.ui.internal.decorators.IDecoratableResource.Staged;
 
 
 /**
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitPreferenceRoot.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitPreferenceRoot.java
similarity index 93%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitPreferenceRoot.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitPreferenceRoot.java
index 3a59f50..70f4d96 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitPreferenceRoot.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitPreferenceRoot.java
@@ -5,8 +5,9 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.preferences;
+package org.eclipse.egit.ui.internal.preferences;
 
+import org.eclipse.egit.ui.Activator;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.swt.SWT;
@@ -14,7 +15,6 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.spearce.egit.ui.Activator;
 
 /** Root preference page for the all of our workspace preferences. */
 public class GitPreferenceRoot extends PreferencePage implements
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitProjectPropertyPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitProjectPropertyPage.java
similarity index 96%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitProjectPropertyPage.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitProjectPropertyPage.java
index 79cf60e..71704cd 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitProjectPropertyPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitProjectPropertyPage.java
@@ -5,12 +5,14 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.preferences;
+package org.eclipse.egit.ui.internal.preferences;
 
 import java.io.IOException;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.egit.core.project.RepositoryMapping;
+import org.eclipse.egit.ui.UIText;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -20,8 +22,6 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.dialogs.PropertyPage;
-import org.spearce.egit.core.project.RepositoryMapping;
-import org.spearce.egit.ui.UIText;
 import org.spearce.jgit.lib.ObjectId;
 import org.spearce.jgit.lib.Repository;
 
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/HistoryPreferencePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/HistoryPreferencePage.java
similarity index 90%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/HistoryPreferencePage.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/HistoryPreferencePage.java
index 00e02ec..17bee9d 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/HistoryPreferencePage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/HistoryPreferencePage.java
@@ -5,15 +5,15 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.preferences;
+package org.eclipse.egit.ui.internal.preferences;
 
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIPreferences;
+import org.eclipse.egit.ui.UIText;
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIPreferences;
-import org.spearce.egit.ui.UIText;
 
 /** Preferences for our history view. */
 public class HistoryPreferencePage extends FieldEditorPreferencePage
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/StorageSizeFieldEditor.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/StorageSizeFieldEditor.java
similarity index 98%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/StorageSizeFieldEditor.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/StorageSizeFieldEditor.java
index 0a51eb1..45d67fe 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/StorageSizeFieldEditor.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/StorageSizeFieldEditor.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.preferences;
+package org.eclipse.egit.ui.internal.preferences;
 
 import org.eclipse.jface.preference.StringFieldEditor;
 import org.eclipse.jface.resource.JFaceResources;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/WindowCachePreferencePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/WindowCachePreferencePage.java
similarity index 90%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/WindowCachePreferencePage.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/WindowCachePreferencePage.java
index 0db52af..050e781 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/WindowCachePreferencePage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/WindowCachePreferencePage.java
@@ -5,16 +5,16 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.preferences;
+package org.eclipse.egit.ui.internal.preferences;
 
+import org.eclipse.egit.core.Activator;
+import org.eclipse.egit.core.GitCorePreferences;
+import org.eclipse.egit.core.project.GitProjectData;
+import org.eclipse.egit.ui.UIText;
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.spearce.egit.core.Activator;
-import org.spearce.egit.core.GitCorePreferences;
-import org.spearce.egit.core.project.GitProjectData;
-import org.spearce.egit.ui.UIText;
 
 /** Preferences for our window cache. */
 public class WindowCachePreferencePage extends FieldEditorPreferencePage
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/ConfirmationPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/ConfirmationPage.java
similarity index 92%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/ConfirmationPage.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/ConfirmationPage.java
index 6e925a7..4b4d505 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/ConfirmationPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/ConfirmationPage.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.push;
+package org.eclipse.egit.ui.internal.push;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -15,6 +15,15 @@
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.egit.core.op.PushOperation;
+import org.eclipse.egit.core.op.PushOperationResult;
+import org.eclipse.egit.core.op.PushOperationSpecification;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIText;
+import org.eclipse.egit.ui.internal.components.RefSpecPage;
+import org.eclipse.egit.ui.internal.components.RepositorySelection;
+import org.eclipse.egit.ui.internal.components.RepositorySelectionPage;
+import org.eclipse.egit.ui.internal.components.SelectionChangeListener;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.osgi.util.NLS;
@@ -24,15 +33,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.spearce.egit.core.op.PushOperation;
-import org.spearce.egit.core.op.PushOperationResult;
-import org.spearce.egit.core.op.PushOperationSpecification;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIText;
-import org.spearce.egit.ui.internal.components.RefSpecPage;
-import org.spearce.egit.ui.internal.components.RepositorySelection;
-import org.spearce.egit.ui.internal.components.RepositorySelectionPage;
-import org.spearce.egit.ui.internal.components.SelectionChangeListener;
 import org.spearce.jgit.lib.Repository;
 import org.spearce.jgit.transport.RefSpec;
 import org.spearce.jgit.transport.RemoteRefUpdate;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/PushResultDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultDialog.java
similarity index 94%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/PushResultDialog.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultDialog.java
index bace9ad..0f3cf34 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/PushResultDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultDialog.java
@@ -5,8 +5,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.push;
+package org.eclipse.egit.ui.internal.push;
 
+import org.eclipse.egit.core.op.PushOperationResult;
+import org.eclipse.egit.ui.UIText;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.osgi.util.NLS;
@@ -16,8 +18,6 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
-import org.spearce.egit.core.op.PushOperationResult;
-import org.spearce.egit.ui.UIText;
 import org.spearce.jgit.lib.Repository;
 
 class PushResultDialog extends Dialog {
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/PushResultTable.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultTable.java
similarity index 97%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/PushResultTable.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultTable.java
index 6f460dc..8d3ddfb 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/PushResultTable.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultTable.java
@@ -5,8 +5,12 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.push;
+package org.eclipse.egit.ui.internal.push;
 
+import org.eclipse.egit.core.op.PushOperationResult;
+import org.eclipse.egit.ui.UIIcons;
+import org.eclipse.egit.ui.UIText;
+import org.eclipse.egit.ui.internal.components.CenteredImageLabelProvider;
 import org.eclipse.jface.layout.TableColumnLayout;
 import org.eclipse.jface.resource.ColorRegistry;
 import org.eclipse.jface.resource.ImageRegistry;
@@ -29,10 +33,6 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
-import org.spearce.egit.core.op.PushOperationResult;
-import org.spearce.egit.ui.UIIcons;
-import org.spearce.egit.ui.UIText;
-import org.spearce.egit.ui.internal.components.CenteredImageLabelProvider;
 import org.spearce.jgit.lib.Constants;
 import org.spearce.jgit.lib.ObjectId;
 import org.spearce.jgit.lib.Ref;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/PushWizard.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushWizard.java
similarity index 93%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/PushWizard.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushWizard.java
index b2ef5ae..f70fe19 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/PushWizard.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushWizard.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.push;
+package org.eclipse.egit.ui.internal.push;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -17,6 +17,15 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.egit.core.op.PushOperation;
+import org.eclipse.egit.core.op.PushOperationResult;
+import org.eclipse.egit.core.op.PushOperationSpecification;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIIcons;
+import org.eclipse.egit.ui.UIText;
+import org.eclipse.egit.ui.internal.components.RefSpecPage;
+import org.eclipse.egit.ui.internal.components.RepositorySelection;
+import org.eclipse.egit.ui.internal.components.RepositorySelectionPage;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.wizard.IWizardPage;
@@ -24,15 +33,6 @@
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
-import org.spearce.egit.core.op.PushOperation;
-import org.spearce.egit.core.op.PushOperationResult;
-import org.spearce.egit.core.op.PushOperationSpecification;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIIcons;
-import org.spearce.egit.ui.UIText;
-import org.spearce.egit.ui.internal.components.RefSpecPage;
-import org.spearce.egit.ui.internal.components.RepositorySelection;
-import org.spearce.egit.ui.internal.components.RepositorySelectionPage;
 import org.spearce.jgit.lib.Repository;
 import org.spearce.jgit.lib.RepositoryConfig;
 import org.spearce.jgit.transport.RefSpec;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/RefUpdateContentProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/RefUpdateContentProvider.java
similarity index 95%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/RefUpdateContentProvider.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/RefUpdateContentProvider.java
index 5492d40..c9b74cc 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/RefUpdateContentProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/RefUpdateContentProvider.java
@@ -5,15 +5,15 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.push;
+package org.eclipse.egit.ui.internal.push;
 
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.Map.Entry;
 
+import org.eclipse.egit.core.op.PushOperationResult;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
-import org.spearce.egit.core.op.PushOperationResult;
 import org.spearce.jgit.transport.RemoteRefUpdate;
 import org.spearce.jgit.transport.URIish;
 
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/RefUpdateElement.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/RefUpdateElement.java
similarity index 94%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/RefUpdateElement.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/RefUpdateElement.java
index 1c31cee..b660f50 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/RefUpdateElement.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/RefUpdateElement.java
@@ -5,9 +5,9 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.push;
+package org.eclipse.egit.ui.internal.push;
 
-import org.spearce.egit.core.op.PushOperationResult;
+import org.eclipse.egit.core.op.PushOperationResult;
 import org.spearce.jgit.lib.Ref;
 import org.spearce.jgit.transport.RemoteRefUpdate;
 import org.spearce.jgit.transport.URIish;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/sharing/ExistingOrNewPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/ExistingOrNewPage.java
similarity index 96%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/sharing/ExistingOrNewPage.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/ExistingOrNewPage.java
index 8676f0a..d9a7766 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/sharing/ExistingOrNewPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/ExistingOrNewPage.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.sharing;
+package org.eclipse.egit.ui.internal.sharing;
 
 import java.io.File;
 import java.io.IOException;
@@ -18,6 +18,11 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.egit.core.Activator;
+import org.eclipse.egit.core.project.RepositoryFinder;
+import org.eclipse.egit.core.project.RepositoryMapping;
+import org.eclipse.egit.ui.UIIcons;
+import org.eclipse.egit.ui.UIText;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.wizard.WizardPage;
@@ -34,11 +39,6 @@
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeColumn;
 import org.eclipse.swt.widgets.TreeItem;
-import org.spearce.egit.core.Activator;
-import org.spearce.egit.core.project.RepositoryFinder;
-import org.spearce.egit.core.project.RepositoryMapping;
-import org.spearce.egit.ui.UIIcons;
-import org.spearce.egit.ui.UIText;
 import org.spearce.jgit.lib.Repository;
 
 /**
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/sharing/SharingWizard.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/SharingWizard.java
similarity index 94%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/internal/sharing/SharingWizard.java
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/SharingWizard.java
index 1e89ab2..5d2ac5c 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/sharing/SharingWizard.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/SharingWizard.java
@@ -6,7 +6,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * See LICENSE for the full license text, also available.
  *******************************************************************************/
-package org.spearce.egit.ui.internal.sharing;
+package org.eclipse.egit.ui.internal.sharing;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -15,15 +15,15 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.egit.core.op.ConnectProviderOperation;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.egit.ui.UIText;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.team.ui.IConfigurationWizard;
 import org.eclipse.team.ui.IConfigurationWizardExtension;
 import org.eclipse.ui.IWorkbench;
-import org.spearce.egit.core.op.ConnectProviderOperation;
-import org.spearce.egit.ui.Activator;
-import org.spearce.egit.ui.UIText;
 
 /**
  * The dialog used for activating Team>Share, i.e. to create a new
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
similarity index 100%
rename from org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties
rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
diff --git a/org.spearce.egit/.classpath b/org.eclipse.egit/.classpath
similarity index 100%
rename from org.spearce.egit/.classpath
rename to org.eclipse.egit/.classpath
diff --git a/org.spearce.egit/.project b/org.eclipse.egit/.project
similarity index 95%
rename from org.spearce.egit/.project
rename to org.eclipse.egit/.project
index bbdc4e3..452d288 100644
--- a/org.spearce.egit/.project
+++ b/org.eclipse.egit/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.spearce.egit</name>
+	<name>org.eclipse.egit</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.spearce.egit/.settings/org.eclipse.core.resources.prefs b/org.eclipse.egit/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.spearce.egit/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.egit/.settings/org.eclipse.core.resources.prefs
diff --git a/org.spearce.egit/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.egit/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from org.spearce.egit/.settings/org.eclipse.core.runtime.prefs
rename to org.eclipse.egit/.settings/org.eclipse.core.runtime.prefs
diff --git a/org.spearce.egit/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.egit/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.spearce.egit/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.egit/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.spearce.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF
similarity index 69%
rename from org.spearce.egit/META-INF/MANIFEST.MF
rename to org.eclipse.egit/META-INF/MANIFEST.MF
index 7e010db..e7f1e9f 100644
--- a/org.spearce.egit/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse Git
-Bundle-SymbolicName: org.spearce.egit
+Bundle-SymbolicName: org.eclipse.egit
 Bundle-Version: 0.4.0.qualifier
-Bundle-Vendor: spearce.org
+Bundle-Vendor: eclipse.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.spearce.egit/about.ini b/org.eclipse.egit/about.ini
similarity index 100%
rename from org.spearce.egit/about.ini
rename to org.eclipse.egit/about.ini
diff --git a/org.spearce.egit/build.properties b/org.eclipse.egit/build.properties
similarity index 100%
rename from org.spearce.egit/build.properties
rename to org.eclipse.egit/build.properties
diff --git a/org.spearce.egit/egit.png b/org.eclipse.egit/egit.png
similarity index 100%
rename from org.spearce.egit/egit.png
rename to org.eclipse.egit/egit.png
diff --git a/org.spearce.egit/egit.svg b/org.eclipse.egit/egit.svg
similarity index 97%
rename from org.spearce.egit/egit.svg
rename to org.eclipse.egit/egit.svg
index 498db7c0a07eda977c4bd8118cec98df3d2d1078..d3ef0411a9b3d0f9fc462d464e262c23c651de47 100644
GIT binary patch
delta 182
zcmaFU$MmL;X+xtsTWWGnW<l}fhJ>ccT)vYx&+&N1j3l<1%l9{ozquhnm~pdQP&g}8
z0Z>4car1<TCrB!Q0{yYCnGh;^VUn8~MHn}$r*7nc%57={s{Nd|iW8Z?qtb~T&i?|l
M2<W=B$qDT|01szK8~^|S

delta 182
zcmaFU$MmL;X+xtsTX8{ZVo~zshJ>ccT)vYx&+&N1j3l<1%l9{ozquhnm~pdQP&g}8
z0Z>4car1<TCrB!Q0{yYCnGh;^VUn8~MHn}$r*7nc%57={s{Nd|iW8Z?qtb~T&i?|l
M2<W=B$qDT|01NU+1^@s6

diff --git a/org.spearce.egit.core/.options b/org.spearce.egit.core/.options
deleted file mode 100644
index 0bc5913..0000000
--- a/org.spearce.egit.core/.options
+++ /dev/null
@@ -1 +0,0 @@
-org.spearce.egit.core/trace/verbose = false
diff --git a/org.spearce.egit.ui/.options b/org.spearce.egit.ui/.options
deleted file mode 100644
index a084b35..0000000
--- a/org.spearce.egit.ui/.options
+++ /dev/null
@@ -1 +0,0 @@
-org.spearce.egit.ui/trace/verbose = false
diff --git a/tag_egit.sh b/tag_egit.sh
index 2eb83f8..a418d9d 100755
--- a/tag_egit.sh
+++ b/tag_egit.sh
@@ -10,8 +10,8 @@ then
 fi
 
 MF=$(git ls-files | grep META-INF/MANIFEST.MF)
-FX=org.spearce.egit-feature/feature.xml
-SX=org.spearce.egit-updatesite/site.xml
+FX=org.eclipse.egit-feature/feature.xml
+SX=org.eclipse.egit-updatesite/site.xml
 ALL="$MF $FX $SX"
 
 replace() {
-- 
1.6.3.2.406.gd6a466
Follow-Ups:
- [egit-dev] Re: [EGIT PATCH] Rename org.spearce.egit -> org.eclipse.egit
  - From: Robin Rosenberg
- Re: [egit-dev] [EGIT PATCH] Rename org.spearce.egit -> org.eclipse.egit
  - From: Alex Blewitt
Prev by Date: [egit-dev] Welcome to the eGit dev mailing list
Next by Date: Re: [egit-dev] [EGIT PATCH] Rename org.spearce.egit -> org.eclipse.egit
Previous by thread: [egit-dev] Welcome to the eGit dev mailing list
Next by thread: Re: [egit-dev] [EGIT PATCH] Rename org.spearce.egit -> org.eclipse.egit
Index(es):
- Date
- Thread
Breadcrumbs
