From f196bf7bc2f5e6f61f86a0f41a4ee9ce061b8b31 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki
Date: Mon, 16 May 2011 12:44:31 -0700
Subject: Refactor package and class names for issue connector.

Change-Id: Icfaf402936f0ebd2527ac9ba2fbbeb135a58e5c4
Signed-off-by: Kevin Sawicki <kevin@github.com>
---
 org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF |   5 +-
 .../org/eclipse/mylyn/github/internal/GitHub.java  | 163 --------
 .../mylyn/github/internal/GitHubException.java     |  74 ----
 .../github/internal/GitHubRepositoryConnector.java | 410 -------------------
 .../github/internal/GitHubTaskAttributeMapper.java |  57 ---
 .../github/internal/GitHubTaskAttributes.java      | 190 ---------
 .../github/internal/GitHubTaskDataHandler.java     | 447 --------------------
 .../mylyn/github/internal/GitHubTaskOperation.java |  76 ----
 .../eclipse/mylyn/github/internal/Messages.java    |  98 -----
 .../eclipse/mylyn/github/internal/QueryUtils.java  |  78 ----
 .../mylyn/github/internal/messages.properties      |  23 --
 .../eclipse/mylyn/internal/github/core/GitHub.java | 163 ++++++++
 .../internal/github/core/GitHubException.java      |  74 ++++
 .../mylyn/internal/github/core/Messages.java       |  41 ++
 .../mylyn/internal/github/core/QueryUtils.java     |  78 ++++
 .../github/core/gist/GistAttachmentHandler.java    |   2 +-
 .../internal/github/core/gist/GistConnector.java   |   2 +-
 .../github/core/gist/GistTaskDataHandler.java      |   6 +-
 .../internal/github/core/issue/IssueAttribute.java | 190 +++++++++
 .../github/core/issue/IssueAttributeMapper.java    |  57 +++
 .../internal/github/core/issue/IssueConnector.java | 413 +++++++++++++++++++
 .../internal/github/core/issue/IssueOperation.java |  76 ++++
 .../github/core/issue/IssueTaskDataHandler.java    | 449 +++++++++++++++++++++
 .../mylyn/internal/github/core/issue/Messages.java |  86 ++++
 .../internal/github/core/issue/messages.properties |  19 +
 .../mylyn/internal/github/core/messages.properties |   4 +
 .../GitHubRepositoryConnectorUIHeadlessTest.java   |   9 +-
 org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF   |   4 +-
 org.eclipse.mylyn.github.ui/plugin.xml             |   8 +-
 .../github/ui/internal/CreateGistHandler.java      | 119 ------
 .../mylyn/github/ui/internal/CreateGistJob.java    |  66 ---
 .../github/ui/internal/GistNotificationPopup.java  |  77 ----
 .../ui/internal/GitHubRepositoryConnectorUI.java   | 173 --------
 .../ui/internal/GitHubRepositoryQueryPage.java     | 436 --------------------
 .../ui/internal/GitHubRepositorySettingsPage.java  | 204 ----------
 .../github/ui/internal/GitHubTaskEditorPage.java   |  71 ----
 .../ui/internal/GitHubTaskEditorPageFactory.java   |  62 ---
 .../ui/internal/ImportRepositoriesWizard.java      |   2 +-
 .../github/ui/internal/IssueAttributePart.java     | 244 -----------
 .../ui/internal/IssueLabelAttributeEditor.java     | 250 ------------
 .../mylyn/github/ui/internal/IssueSummaryPart.java | 235 -----------
 .../eclipse/mylyn/github/ui/internal/Messages.java |  87 ----
 .../ui/internal/RepositorySelectionWizardPage.java |   2 +-
 .../mylyn/github/ui/internal/messages.properties   |  29 --
 .../internal/github/ui/gist/CreateGistHandler.java | 120 ++++++
 .../internal/github/ui/gist/CreateGistJob.java     |  67 +++
 .../github/ui/gist/GistNotificationPopup.java      |  78 ++++
 .../github/ui/gist/GistTaskEditorPage.java         |   2 +-
 .../github/ui/issue/IssueAttributePart.java        | 244 +++++++++++
 .../internal/github/ui/issue/IssueConnectorUi.java | 173 ++++++++
 .../github/ui/issue/IssueLabelAttributeEditor.java | 251 ++++++++++++
 .../github/ui/issue/IssueRepositoryQueryPage.java  | 435 ++++++++++++++++++++
 .../ui/issue/IssueRepositorySettingsPage.java      | 204 ++++++++++
 .../internal/github/ui/issue/IssueSummaryPart.java | 237 +++++++++++
 .../github/ui/issue/IssueTaskEditorPage.java       |  71 ++++
 .../ui/issue/IssueTaskEditorPageFactory.java       |  63 +++
 .../mylyn/internal/github/ui/issue/Messages.java   | 113 ++++++
 .../internal/github/ui/issue/messages.properties   |  28 ++
 58 files changed, 3757 insertions(+), 3688 deletions(-)
 delete mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHub.java
 delete mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubException.java
 delete mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubRepositoryConnector.java
 delete mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskAttributeMapper.java
 delete mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskAttributes.java
 delete mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskDataHandler.java
 delete mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskOperation.java
 delete mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/Messages.java
 delete mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/QueryUtils.java
 delete mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/messages.properties
 create mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHub.java
 create mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHubException.java
 create mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/Messages.java
 create mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/QueryUtils.java
 create mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueAttribute.java
 create mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueAttributeMapper.java
 create mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueConnector.java
 create mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueOperation.java
 create mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueTaskDataHandler.java
 create mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/Messages.java
 create mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/messages.properties
 create mode 100644 org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/messages.properties
 delete mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/CreateGistHandler.java
 delete mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/CreateGistJob.java
 delete mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GistNotificationPopup.java
 delete mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositoryConnectorUI.java
 delete mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositoryQueryPage.java
 delete mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositorySettingsPage.java
 delete mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubTaskEditorPage.java
 delete mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubTaskEditorPageFactory.java
 delete mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/IssueAttributePart.java
 delete mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/IssueLabelAttributeEditor.java
 delete mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/IssueSummaryPart.java
 create mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CreateGistHandler.java
 create mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CreateGistJob.java
 create mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistNotificationPopup.java
 create mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueAttributePart.java
 create mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueConnectorUi.java
 create mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueLabelAttributeEditor.java
 create mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositoryQueryPage.java
 create mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositorySettingsPage.java
 create mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueSummaryPart.java
 create mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueTaskEditorPage.java
 create mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueTaskEditorPageFactory.java
 create mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/Messages.java
 create mode 100644 org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/messages.properties

diff --git a/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF
index 1721cbc7..f03adb37 100644
--- a/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF
@@ -6,8 +6,9 @@ Bundle-SymbolicName: org.eclipse.mylyn.github.core;singleton:=true
 Bundle-Version: 0.1.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.mylyn.github.internal;x-friends:="org.eclipse.mylyn.github.ui",
- org.eclipse.mylyn.internal.github.core.gist;x-friends:="org.eclipse.mylyn.github.ui"
+Export-Package: org.eclipse.mylyn.internal.github.core;x-friends:="org.eclipse.mylyn.github.ui",
+ org.eclipse.mylyn.internal.github.core.gist;x-friends:="org.eclipse.mylyn.github.ui",
+ org.eclipse.mylyn.internal.github.core.issue;x-friends:="org.eclipse.mylyn.github.ui"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
  org.eclipse.mylyn.tasks.core;bundle-version="3.2.0",
  org.eclipse.mylyn.commons.net;bundle-version="3.2.0",
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHub.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHub.java
deleted file mode 100644
index cf2e1330..00000000
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHub.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Green <david.green@tasktop.com> - initial contribution
- *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
- *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
- *******************************************************************************/
-package org.eclipse.mylyn.github.internal;
-
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.egit.github.core.Repository;
-
-/**
- * GitHub class
- */
-public class GitHub {
-
-	/** BUNDLE_ID */
-	public static final String BUNDLE_ID = "org.eclipse.mylyn.github.core";
-
-	/** CONNECTOR_KIND */
-	public static final String CONNECTOR_KIND = "github";
-
-	/** HTTP_WWW_GITHUB_ORG */
-	public static final String HTTP_WWW_GITHUB_ORG = "http://www.github.org";
-
-	/** HTTP_GITHUB_COM */
-	public static final String HTTP_GITHUB_COM = "http://github.com";
-
-	/** URL_PATTERN */
-	public static final Pattern URL_PATTERN = Pattern.compile("(?:"
-			+ Pattern.quote(HTTP_WWW_GITHUB_ORG) + "|"
-			+ Pattern.quote(HTTP_GITHUB_COM) + ")/([^/]+)/([^/]+)");
-
-	/**
-	 * Create status of severity with message
-	 * 
-	 * @param severity
-	 * @param message
-	 * @return status
-	 */
-	public static IStatus createStatus(int severity, String message) {
-		return new Status(severity, BUNDLE_ID, message);
-	}
-
-	/**
-	 * Create status of severity with message and throwable
-	 * 
-	 * @param severity
-	 * @param message
-	 * @param e
-	 * @return status
-	 */
-	public static IStatus createStatus(int severity, String message, Throwable e) {
-		return new Status(severity, BUNDLE_ID, message, e);
-	}
-
-	/**
-	 * Create error status from message
-	 * 
-	 * @param message
-	 * @return status
-	 */
-	public static IStatus createErrorStatus(String message) {
-		return createStatus(IStatus.ERROR, message);
-	}
-
-	/**
-	 * Create error status from message and throwable
-	 * 
-	 * @param message
-	 * @param t
-	 * @return status
-	 */
-	public static IStatus createErrorStatus(String message, Throwable t) {
-		return createStatus(IStatus.ERROR, message, t);
-	}
-
-	/**
-	 * Create error status from throwable
-	 * 
-	 * @param e
-	 * @return status
-	 */
-	public static IStatus createErrorStatus(Throwable e) {
-		return createStatus(IStatus.ERROR,
-				"Unexpected error: " + e.getLocalizedMessage(), e);
-	}
-
-	/**
-	 * Get log
-	 * 
-	 * @return log
-	 */
-	public static ILog getLog() {
-		return Platform.getLog(Platform.getBundle(BUNDLE_ID));
-	}
-
-	/**
-	 * Log message and throwable as error status
-	 * 
-	 * @param message
-	 * @param t
-	 */
-	public static void logError(String message, Throwable t) {
-		getLog().log(createErrorStatus(message, t));
-	}
-
-	/**
-	 * Log throwable as error status
-	 * 
-	 * @param t
-	 */
-	public static void logError(Throwable t) {
-		getLog().log(createErrorStatus(t.getMessage(), t));
-	}
-
-	/**
-	 * Get repository for url
-	 * 
-	 * @param repositoryUrl
-	 * @return repository or null if not present in url
-	 */
-	public static Repository getRepository(String repositoryUrl) {
-		return Repository.createFromUrl(repositoryUrl);
-	}
-
-	/**
-	 * Create url with github.com host
-	 * 
-	 * @param user
-	 * @param project
-	 * @return url
-	 * 
-	 * @see #createGitHubUrlAlternate(String, String)
-	 */
-	public static String createGitHubUrl(String user, String project) {
-		return HTTP_GITHUB_COM + '/' + user + '/' + project;
-	}
-
-	/**
-	 * Create url with github.org host
-	 * 
-	 * @param user
-	 * @param project
-	 * @return url
-	 * 
-	 * @see #createGitHubUrl(String, String)
-	 */
-	public static String createGitHubUrlAlternate(String user, String project) {
-		return HTTP_WWW_GITHUB_ORG + '/' + user + '/' + project;
-	}
-}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubException.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubException.java
deleted file mode 100644
index 6ff1a908..00000000
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubException.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011 GitHub Inc.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *    Kevin Sawicki (GitHub Inc.) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.github.internal;
-
-import java.io.IOException;
-import java.text.MessageFormat;
-import java.util.List;
-
-import org.eclipse.egit.github.core.FieldError;
-import org.eclipse.egit.github.core.RequestError;
-import org.eclipse.egit.github.core.client.RequestException;
-
-/**
- * GitHub exception that wraps and formats a {@link RequestException}
- */
-public class GitHubException extends IOException {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -1456910662911777231L;
-
-	/**
-	 * Create GitHub exception from {@link RequestException}
-	 * 
-	 * @param cause
-	 */
-	public GitHubException(RequestException cause) {
-		super(cause);
-	}
-
-	public String getMessage() {
-		RequestError error = ((RequestException) getCause()).getError();
-		StringBuilder message = new StringBuilder(error.getMessage());
-		List<FieldError> errors = error.getErrors();
-		if (errors != null && errors.size() > 0) {
-			message.append(':');
-			for (FieldError fieldError : errors)
-				message.append(' ').append(format(fieldError)).append(',');
-			message.deleteCharAt(message.length() - 1);
-		}
-		return message.toString();
-	}
-
-	private String format(FieldError error) {
-		String code = error.getCode();
-		String value = error.getValue();
-		String field = error.getField();
-		String resource = error.getResource();
-		if (FieldError.CODE_INVALID.equals(code))
-			if (value != null)
-				return MessageFormat
-						.format(Messages.FieldError_InvalidFieldWithValue,
-								value, field);
-			else
-				return MessageFormat.format(Messages.FieldError_InvalidField,
-						field, value);
-		else if (FieldError.CODE_MISSING_FIELD.equals(code))
-			return MessageFormat
-					.format(Messages.FieldError_MissingField, field);
-		else
-			return MessageFormat.format(Messages.FieldError_ResourceError,
-					field, resource);
-	}
-
-}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubRepositoryConnector.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubRepositoryConnector.java
deleted file mode 100644
index 24f688b5..00000000
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubRepositoryConnector.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Green <david.green@tasktop.com> - initial contribution
- *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
- *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
- *******************************************************************************/
-package org.eclipse.mylyn.github.internal;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.egit.github.core.Comment;
-import org.eclipse.egit.github.core.Issue;
-import org.eclipse.egit.github.core.Label;
-import org.eclipse.egit.github.core.Milestone;
-import org.eclipse.egit.github.core.Repository;
-import org.eclipse.egit.github.core.client.GitHubClient;
-import org.eclipse.egit.github.core.client.RequestException;
-import org.eclipse.egit.github.core.service.IssueService;
-import org.eclipse.egit.github.core.service.LabelService;
-import org.eclipse.egit.github.core.service.MilestoneService;
-import org.eclipse.egit.github.core.util.LabelComparator;
-import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
-import org.eclipse.mylyn.commons.net.AuthenticationType;
-import org.eclipse.mylyn.commons.net.Policy;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
-import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.data.AbstractTaskDataHandler;
-import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
-import org.eclipse.mylyn.tasks.core.data.TaskData;
-import org.eclipse.mylyn.tasks.core.data.TaskDataCollector;
-import org.eclipse.mylyn.tasks.core.data.TaskMapper;
-import org.eclipse.mylyn.tasks.core.sync.ISynchronizationSession;
-
-/**
- * GitHub connector.
- */
-public class GitHubRepositoryConnector extends AbstractRepositoryConnector {
-
-	/**
-	 * GitHub kind.
-	 */
-	public static final String KIND = GitHub.CONNECTOR_KIND;
-
-	/**
-	 * Create client for repository
-	 * 
-	 * @param repository
-	 * @return client
-	 */
-	public static GitHubClient createClient(TaskRepository repository) {
-		GitHubClient client = new GitHubClient();
-		AuthenticationCredentials credentials = repository
-				.getCredentials(AuthenticationType.REPOSITORY);
-		if (credentials != null)
-			client.setCredentials(credentials.getUserName(),
-					credentials.getPassword());
-		return client;
-	}
-
-	/**
-	 * GitHub specific {@link AbstractTaskDataHandler}.
-	 */
-	private final GitHubTaskDataHandler taskDataHandler;
-
-	private final Map<TaskRepository, List<Label>> repositoryLabels = Collections
-			.synchronizedMap(new HashMap<TaskRepository, List<Label>>());
-
-	private final Map<TaskRepository, List<Milestone>> repositoryMilestones = Collections
-			.synchronizedMap(new HashMap<TaskRepository, List<Milestone>>());
-
-	/**
-	 * Create GitHub issue repository connector
-	 */
-	public GitHubRepositoryConnector() {
-		taskDataHandler = new GitHubTaskDataHandler(this);
-	}
-
-	/**
-	 * Refresh labels for repository
-	 * 
-	 * @param repository
-	 * @return labels
-	 * @throws CoreException
-	 */
-	public List<Label> refreshLabels(TaskRepository repository)
-			throws CoreException {
-		Assert.isNotNull(repository, "Repository cannot be null"); //$NON-NLS-1$
-		Repository repo = GitHub.getRepository(repository.getRepositoryUrl());
-		GitHubClient client = createClient(repository);
-		LabelService service = new LabelService(client);
-		try {
-			List<Label> labels = service.getLabels(repo.getOwner(),
-					repo.getName());
-			Collections.sort(labels, new LabelComparator());
-			this.repositoryLabels.put(repository, labels);
-			return labels;
-		} catch (IOException e) {
-			throw new CoreException(GitHub.createErrorStatus(e));
-		}
-	}
-
-	/**
-	 * Get labels for task repository.
-	 * 
-	 * @param repository
-	 * @return non-null but possibly empty list of labels
-	 */
-	public List<Label> getLabels(TaskRepository repository) {
-		Assert.isNotNull(repository, "Repository cannot be null"); //$NON-NLS-1$
-		List<Label> labels = new LinkedList<Label>();
-		List<Label> cached = this.repositoryLabels.get(repository);
-		if (cached != null) {
-			labels.addAll(cached);
-		}
-		return labels;
-	}
-
-	/**
-	 * Are there cached labels for the specified task repository?
-	 * 
-	 * @param repository
-	 * @return true if contains labels, false otherwise
-	 */
-	public boolean hasCachedLabels(TaskRepository repository) {
-		return this.repositoryLabels.containsKey(repository);
-	}
-
-	/**
-	 * Refresh milestones for repository
-	 * 
-	 * @param repository
-	 * @return milestones
-	 * @throws CoreException
-	 */
-	public List<Milestone> refreshMilestones(TaskRepository repository)
-			throws CoreException {
-		Assert.isNotNull(repository, "Repository cannot be null"); //$NON-NLS-1$
-		Repository repo = GitHub.getRepository(repository.getRepositoryUrl());
-		GitHubClient client = createClient(repository);
-		MilestoneService service = new MilestoneService(client);
-		try {
-			List<Milestone> milestones = new LinkedList<Milestone>();
-			milestones.addAll(service.getMilestones(repo.getOwner(),
-					repo.getName(), IssueService.STATE_OPEN));
-			milestones.addAll(service.getMilestones(repo.getOwner(),
-					repo.getName(), IssueService.STATE_CLOSED));
-			this.repositoryMilestones.put(repository, milestones);
-			return milestones;
-		} catch (IOException e) {
-			throw new CoreException(GitHub.createErrorStatus(e));
-		}
-	}
-
-	/**
-	 * Get milestones for task repository.
-	 * 
-	 * @param repository
-	 * @return non-null but possibly empty list of milestones
-	 */
-	public List<Milestone> getMilestones(TaskRepository repository) {
-		Assert.isNotNull(repository, "Repository cannot be null"); //$NON-NLS-1$
-		List<Milestone> milestones = new LinkedList<Milestone>();
-		List<Milestone> cached = this.repositoryMilestones.get(repository);
-		if (cached != null) {
-			milestones.addAll(cached);
-		}
-		return milestones;
-	}
-
-	/**
-	 * Are there cached milestones for the specified task repository?
-	 * 
-	 * @param repository
-	 * @return true if contains milestones, false otherwise
-	 */
-	public boolean hasCachedMilestones(TaskRepository repository) {
-		return this.repositoryMilestones.containsKey(repository);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @return always {@code true}
-	 */
-	@Override
-	public boolean canCreateNewTask(TaskRepository repository) {
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @return always {@code true}
-	 */
-	@Override
-	public boolean canCreateTaskFromKey(TaskRepository repository) {
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see #KIND
-	 */
-	@Override
-	public String getConnectorKind() {
-		return KIND;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getLabel() {
-		return Messages.GitHubRepositoryConnector_LabelConnector;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public AbstractTaskDataHandler getTaskDataHandler() {
-		return this.taskDataHandler;
-	}
-
-	@Override
-	public IStatus performQuery(TaskRepository repository,
-			IRepositoryQuery query, TaskDataCollector collector,
-			ISynchronizationSession session, IProgressMonitor monitor) {
-		IStatus result = Status.OK_STATUS;
-		List<String> statuses = QueryUtils.getAttributes(
-				IssueService.FILTER_STATE, query);
-
-		monitor.beginTask(Messages.GitHubRepositoryConnector_TaskQuerying,
-				statuses.size());
-		try {
-			Repository repo = GitHub.getRepository(repository
-					.getRepositoryUrl());
-
-			GitHubClient client = createClient(repository);
-			IssueService service = new IssueService(client);
-
-			Map<String, String> filterData = new HashMap<String, String>();
-			String mentions = query.getAttribute(IssueService.FILTER_MENTIONED);
-			if (mentions != null)
-				filterData.put(IssueService.FILTER_MENTIONED, mentions);
-
-			String assignee = query.getAttribute(IssueService.FILTER_ASSIGNEE);
-			if (assignee != null)
-				filterData.put(IssueService.FILTER_ASSIGNEE, assignee);
-
-			String milestone = query
-					.getAttribute(IssueService.FILTER_MILESTONE);
-			if (milestone != null)
-				filterData.put(IssueService.FILTER_MILESTONE, milestone);
-
-			List<String> labels = QueryUtils.getAttributes(
-					IssueService.FILTER_LABELS, query);
-			if (!labels.isEmpty()) {
-				StringBuilder labelsQuery = new StringBuilder();
-				for (String label : labels)
-					labelsQuery.append(label).append(',');
-				filterData.put(IssueService.FILTER_LABELS,
-						labelsQuery.toString());
-			}
-
-			for (String status : statuses) {
-				filterData.put(IssueService.FILTER_STATE, status);
-				List<Issue> issues = service.getIssues(repo.getOwner(),
-						repo.getName(), filterData);
-
-				// collect task data
-				for (Issue issue : issues) {
-					TaskData taskData = taskDataHandler.createTaskData(
-							repository, monitor, repo.getOwner(),
-							repo.getName(), issue);
-					taskData.setPartial(true);
-					collector.accept(taskData);
-				}
-				monitor.worked(1);
-			}
-
-			result = Status.OK_STATUS;
-		} catch (RequestException e) {
-			result = GitHub.createErrorStatus(new GitHubException(e));
-		} catch (IOException e) {
-			result = GitHub.createErrorStatus(e);
-		}
-
-		monitor.done();
-		return result;
-	}
-
-	@Override
-	public TaskData getTaskData(TaskRepository repository, String taskId,
-			IProgressMonitor monitor) throws CoreException {
-		Repository repo = GitHub.getRepository(repository.getRepositoryUrl());
-
-		try {
-			GitHubClient client = createClient(repository);
-			IssueService service = new IssueService(client);
-			Issue issue = service.getIssue(repo.getOwner(), repo.getName(),
-					taskId);
-			List<Comment> comments = null;
-			if (issue.getComments() > 0) {
-				comments = service.getComments(repo.getOwner(), repo.getName(),
-						taskId);
-			}
-			TaskData taskData = taskDataHandler.createTaskData(repository,
-					monitor, repo.getOwner(), repo.getName(), issue, comments);
-
-			return taskData;
-		} catch (IOException e) {
-			throw new CoreException(GitHub.createErrorStatus(e));
-		}
-	}
-
-	@Override
-	public String getRepositoryUrlFromTaskUrl(String taskFullUrl) {
-		if (taskFullUrl != null) {
-			Matcher matcher = Pattern.compile(
-					"(http://.+?)/issues/issue/([^/]+)").matcher(taskFullUrl); //$NON-NLS-1$
-			if (matcher.matches()) {
-				return matcher.group(1);
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public String getTaskIdFromTaskUrl(String taskFullUrl) {
-		if (taskFullUrl != null) {
-			Matcher matcher = Pattern
-					.compile(".+?/issues/issue/([^/]+)").matcher(taskFullUrl); //$NON-NLS-1$
-			if (matcher.matches()) {
-				return matcher.group(1);
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public String getTaskUrl(String repositoryUrl, String taskId) {
-		return repositoryUrl + "/issues/issue/" + taskId; //$NON-NLS-1$
-	}
-
-	@Override
-	public void updateRepositoryConfiguration(TaskRepository taskRepository,
-			IProgressMonitor monitor) throws CoreException {
-		monitor = Policy.monitorFor(monitor);
-		monitor.beginTask("", 2); //$NON-NLS-1$
-		monitor.setTaskName(Messages.GitHubRepositoryConnector_TaskUpdatingLabels);
-		refreshLabels(taskRepository);
-		monitor.worked(1);
-		monitor.setTaskName(Messages.GitHubRepositoryConnector_TaskUpdatingMilestones);
-		refreshMilestones(taskRepository);
-		monitor.done();
-	}
-
-	@Override
-	public boolean hasTaskChanged(TaskRepository repository, ITask task,
-			TaskData taskData) {
-		TaskAttribute modAttribute = taskData.getRoot().getAttribute(
-				TaskAttribute.DATE_MODIFICATION);
-		if (modAttribute == null)
-			return false;
-
-		boolean changed = true;
-		Date modDate = task.getModificationDate();
-		if (modDate != null) {
-			Date updateDate = taskData.getAttributeMapper().getDateValue(
-					modAttribute);
-			if (updateDate != null)
-				changed = updateDate.after(modDate);
-		}
-		return changed;
-	}
-
-	@Override
-	public void updateTaskFromTaskData(TaskRepository taskRepository,
-			ITask task, TaskData taskData) {
-		if (!taskData.isNew()) {
-			task.setUrl(getTaskUrl(taskRepository.getUrl(),
-					taskData.getTaskId()));
-		}
-		new TaskMapper(taskData).applyTo(task);
-	}
-
-}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskAttributeMapper.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskAttributeMapper.java
deleted file mode 100644
index 776ffc05..00000000
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskAttributeMapper.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Green <david.green@tasktop.com> - initial contribution
- *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
- *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
- *******************************************************************************/
-package org.eclipse.mylyn.github.internal;
-
-import java.text.DateFormat;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
-import org.eclipse.mylyn.tasks.core.data.TaskAttributeMapper;
-
-/**
- * GitHub task attribute mapper class.
- */
-public class GitHubTaskAttributeMapper extends TaskAttributeMapper {
-
-	private DateFormat format = DateFormat.getDateTimeInstance(
-			DateFormat.MEDIUM, DateFormat.SHORT);
-
-	/**
-	 * @param taskRepository
-	 */
-	public GitHubTaskAttributeMapper(TaskRepository taskRepository) {
-		super(taskRepository);
-	}
-
-	/**
-	 * @see org.eclipse.mylyn.tasks.core.data.TaskAttributeMapper#getValueLabels(org.eclipse.mylyn.tasks.core.data.TaskAttribute)
-	 */
-	public List<String> getValueLabels(TaskAttribute taskAttribute) {
-		String type = taskAttribute.getMetaData().getType();
-		if (TaskAttribute.TYPE_DATE.equals(type)
-				|| TaskAttribute.TYPE_DATETIME.equals(type)) {
-			String value = taskAttribute.getValue();
-			if (value.length() > 0) {
-				Date date = new Date(Long.parseLong(value));
-				synchronized (this.format) {
-					value = this.format.format(date);
-				}
-				return Collections.singletonList(value);
-			}
-		}
-		return super.getValueLabels(taskAttribute);
-	}
-}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskAttributes.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskAttributes.java
deleted file mode 100644
index 1b6cd3b9..00000000
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskAttributes.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Green <david.green@tasktop.com> - initial contribution
- *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
- *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
- *******************************************************************************/
-package org.eclipse.mylyn.github.internal;
-
-import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
-
-/**
- * GitHub issue task attributes
- */
-public enum GitHubTaskAttributes {
-
-	/**
-	 * Issue key
-	 */
-	KEY(Messages.GitHubTaskAttributes_LabelKey, TaskAttribute.TASK_KEY,
-			TaskAttribute.TYPE_SHORT_TEXT, true, true),
-
-	/**
-	 * Issue title
-	 */
-	TITLE(Messages.GitHubTaskAttributes_LabekSummary, TaskAttribute.SUMMARY,
-			TaskAttribute.TYPE_SHORT_RICH_TEXT, false, true),
-
-	/**
-	 * Issue description
-	 */
-	BODY(Messages.GitHubTaskAttributes_LabelDescription,
-			TaskAttribute.DESCRIPTION, TaskAttribute.TYPE_LONG_RICH_TEXT,
-			false, true),
-
-	/**
-	 * Issue creation date
-	 */
-	CREATION_DATE(Messages.GitHubTaskAttributes_LabelCreated,
-			TaskAttribute.DATE_CREATION, TaskAttribute.TYPE_DATETIME, true,
-			false),
-
-	/**
-	 * Issue modification date
-	 */
-	MODIFICATION_DATE(Messages.GitHubTaskAttributes_LabelModified,
-			TaskAttribute.DATE_MODIFICATION, TaskAttribute.TYPE_DATETIME, true,
-			false),
-
-	/**
-	 * Issue closed date
-	 */
-	CLOSED_DATE(Messages.GitHubTaskAttributes_LabelClosed,
-			TaskAttribute.DATE_COMPLETION, TaskAttribute.TYPE_DATETIME, true,
-			false),
-
-	/**
-	 * Issue status
-	 */
-	STATUS(Messages.GitHubTaskAttributes_LabelStatus, TaskAttribute.STATUS,
-			TaskAttribute.TYPE_SHORT_TEXT, false, true),
-
-	/**
-	 * Issue reporter
-	 */
-	REPORTER(Messages.GitHubTaskAttributes_LabelReporter,
-			TaskAttribute.USER_REPORTER, TaskAttribute.TYPE_PERSON, true, false),
-
-	/**
-	 * Comment being added to issue
-	 */
-	COMMENT_NEW(Messages.GitHubTaskAttributes_LabelComment,
-			TaskAttribute.COMMENT_NEW, TaskAttribute.TYPE_LONG_RICH_TEXT,
-			false, false),
-
-	/**
-	 * Labels applied to issue
-	 */
-	LABELS(Messages.GitHubTaskAttributes_LabelLabels, "github.issue.labels", //$NON-NLS-1$
-			TaskAttribute.TYPE_MULTI_SELECT, true, false),
-
-	/**
-	 * Issue assignee
-	 */
-	ASSIGNEE(Messages.GitHubTaskAttributes_LabelAssignee,
-			TaskAttribute.USER_ASSIGNED, TaskAttribute.TYPE_PERSON, false, true),
-
-	/**
-	 * Issue milestone
-	 */
-	MILESTONE(Messages.GitHubTaskAttributes_LabelMilestone,
-			"github.issue.milestone", TaskAttribute.TYPE_SINGLE_SELECT, //$NON-NLS-1$
-			false, true),
-
-	/**
-	 * Issue assignee gravatar
-	 */
-	ASSIGNEE_GRAVATAR(Messages.GitHubTaskAttributes_LabelAssigneeGravatar,
-			"github.issue.assignee.gravatar", TaskAttribute.TYPE_URL, null, //$NON-NLS-1$
-			true, false),
-
-	/**
-	 * Issue reporter gravatar
-	 */
-	REPORTER_GRAVATAR(Messages.GitHubTaskAttributes_LabelReporterGravatar,
-			"github.issue.reporter.gravatar", TaskAttribute.TYPE_URL, null, //$NON-NLS-1$
-			true, false);
-
-	private final String id;
-	private final String label;
-	private final String kind;
-	private final boolean readOnly;
-	private final boolean initTask;
-	private final String type;
-
-	private GitHubTaskAttributes(String label, String id, String type,
-			boolean readOnly, boolean initTask) {
-		this(label, id, type, TaskAttribute.KIND_DEFAULT, readOnly, initTask);
-	}
-
-	private GitHubTaskAttributes(String label, String id, String type,
-			String kind, boolean readOnly, boolean initTask) {
-		this.label = label;
-		this.id = id;
-		this.kind = kind;
-		this.type = type;
-		this.readOnly = readOnly;
-		this.initTask = initTask;
-	}
-
-	/**
-	 * Get attribute label
-	 * 
-	 * @return label
-	 */
-	public String getLabel() {
-		return label;
-	}
-
-	/**
-	 * Get attribute id
-	 * 
-	 * @return id
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * Get attribute type
-	 * 
-	 * @return type
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * Is attribute read only?
-	 * 
-	 * @return true if read only, false otherwise
-	 */
-	public boolean isReadOnly() {
-		return readOnly;
-	}
-
-	/**
-	 * Get attribute kind
-	 * 
-	 * @return kind
-	 */
-	public String getKind() {
-		return this.kind;
-	}
-
-	/**
-	 * Is this attribute created for new tasks?
-	 * 
-	 * @return true if needed for new tasks, false otherwise
-	 */
-	public boolean isInitTask() {
-		return initTask;
-	}
-
-}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskDataHandler.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskDataHandler.java
deleted file mode 100644
index f65b9239..00000000
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskDataHandler.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Green <david.green@tasktop.com> - initial contribution
- *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
- *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
- *******************************************************************************/
-package org.eclipse.mylyn.github.internal;
-
-import java.io.IOException;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.egit.github.core.Comment;
-import org.eclipse.egit.github.core.Issue;
-import org.eclipse.egit.github.core.Label;
-import org.eclipse.egit.github.core.Milestone;
-import org.eclipse.egit.github.core.Repository;
-import org.eclipse.egit.github.core.User;
-import org.eclipse.egit.github.core.client.GitHubClient;
-import org.eclipse.egit.github.core.client.RequestException;
-import org.eclipse.egit.github.core.service.IssueService;
-import org.eclipse.egit.github.core.service.LabelService;
-import org.eclipse.mylyn.tasks.core.IRepositoryPerson;
-import org.eclipse.mylyn.tasks.core.ITaskMapping;
-import org.eclipse.mylyn.tasks.core.RepositoryResponse;
-import org.eclipse.mylyn.tasks.core.RepositoryResponse.ResponseKind;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.data.AbstractTaskDataHandler;
-import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
-import org.eclipse.mylyn.tasks.core.data.TaskAttributeMapper;
-import org.eclipse.mylyn.tasks.core.data.TaskAttributeMetaData;
-import org.eclipse.mylyn.tasks.core.data.TaskCommentMapper;
-import org.eclipse.mylyn.tasks.core.data.TaskData;
-import org.eclipse.mylyn.tasks.core.data.TaskOperation;
-
-/**
- * GitHub issue task data handler
- */
-public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
-
-	private static final String DATA_VERSION = "1"; //$NON-NLS-1$
-	private static final String MILESTONE_NONE_KEY = "0"; //$NON-NLS-1$
-	private GitHubTaskAttributeMapper taskAttributeMapper = null;
-	private final GitHubRepositoryConnector connector;
-
-	/**
-	 * Create GitHub issue task data handler for connector
-	 * 
-	 * @param connector
-	 */
-	public GitHubTaskDataHandler(GitHubRepositoryConnector connector) {
-		this.connector = connector;
-	}
-
-	@Override
-	public TaskAttributeMapper getAttributeMapper(TaskRepository taskRepository) {
-		if (this.taskAttributeMapper == null)
-			this.taskAttributeMapper = new GitHubTaskAttributeMapper(
-					taskRepository);
-		return this.taskAttributeMapper;
-	}
-
-	public TaskData createTaskData(TaskRepository repository,
-			IProgressMonitor monitor, String user, String project, Issue issue) {
-
-		String key = Integer.toString(issue.getNumber());
-		TaskData data = new TaskData(getAttributeMapper(repository),
-				GitHubRepositoryConnector.KIND, repository.getRepositoryUrl(),
-				key);
-		data.setVersion(DATA_VERSION);
-
-		createOperations(data, issue);
-
-		createAttribute(data, GitHubTaskAttributes.KEY, key);
-		createAttribute(data, GitHubTaskAttributes.TITLE, issue.getTitle());
-		createAttribute(data, GitHubTaskAttributes.BODY, issue.getBody());
-		createAttribute(data, GitHubTaskAttributes.STATUS, issue.getState());
-		createAttribute(data, GitHubTaskAttributes.CREATION_DATE,
-				issue.getCreatedAt());
-		createAttribute(data, GitHubTaskAttributes.MODIFICATION_DATE,
-				issue.getUpdatedAt());
-		createAttribute(data, GitHubTaskAttributes.CLOSED_DATE,
-				issue.getClosedAt());
-
-		User reporter = issue.getUser();
-		createAttribute(data, GitHubTaskAttributes.REPORTER, reporter,
-				repository);
-		String reporterGravatar = reporter != null ? reporter.getGravatarUrl()
-				: null;
-		createAttribute(data, GitHubTaskAttributes.REPORTER_GRAVATAR,
-				reporterGravatar);
-
-		User assignee = issue.getAssignee();
-		createAttribute(data, GitHubTaskAttributes.ASSIGNEE, assignee,
-				repository);
-		String assigneeGravatar = assignee != null ? assignee.getGravatarUrl()
-				: null;
-		createAttribute(data, GitHubTaskAttributes.ASSIGNEE_GRAVATAR,
-				assigneeGravatar);
-
-		createAttribute(data, GitHubTaskAttributes.COMMENT_NEW);
-
-		createLabels(repository, data, issue);
-
-		createMilestone(repository, data, issue);
-
-		return data;
-	}
-
-	private void createMilestone(TaskRepository repository, TaskData data,
-			Issue issue) {
-		Milestone current = issue.getMilestone();
-		String number = current != null ? Integer.toString(current.getNumber())
-				: MILESTONE_NONE_KEY;
-		TaskAttribute milestoneAttribute = createAttribute(data,
-				GitHubTaskAttributes.MILESTONE, number);
-
-		if (!this.connector.hasCachedMilestones(repository))
-			try {
-				this.connector.refreshMilestones(repository);
-			} catch (CoreException ignore) {
-				// Ignored
-			}
-
-		List<Milestone> cachedMilestones = this.connector
-				.getMilestones(repository);
-		milestoneAttribute.putOption(MILESTONE_NONE_KEY,
-				Messages.GitHubTaskDataHandler_MilestoneNone);
-		for (Milestone milestone : cachedMilestones)
-			milestoneAttribute.putOption(
-					Integer.toString(milestone.getNumber()),
-					milestone.getTitle());
-	}
-
-	private void createLabels(TaskRepository repository, TaskData data,
-			Issue issue) {
-		TaskAttribute labels = createAttribute(data,
-				GitHubTaskAttributes.LABELS, issue.getLabels());
-
-		if (!this.connector.hasCachedLabels(repository))
-			try {
-				this.connector.refreshLabels(repository);
-			} catch (CoreException ignore) {
-				// Ignored
-			}
-
-		List<Label> cachedLabels = this.connector.getLabels(repository);
-		for (Label label : cachedLabels)
-			labels.putOption(label.getName(), label.getName());
-	}
-
-	private void createOperations(TaskData data, Issue issue) {
-		TaskAttribute operationAttribute = data.getRoot().createAttribute(
-				TaskAttribute.OPERATION);
-		operationAttribute.getMetaData().setType(TaskAttribute.TYPE_OPERATION);
-
-		if (!data.isNew()) {
-			String state = issue.getState();
-			if (state != null) {
-				addOperation(data, issue, GitHubTaskOperation.LEAVE, true);
-				if (state.equals(IssueService.STATE_OPEN))
-					addOperation(data, issue, GitHubTaskOperation.CLOSE, false);
-				else if (state.equals(IssueService.STATE_CLOSED))
-					addOperation(data, issue, GitHubTaskOperation.REOPEN, false);
-			}
-		}
-	}
-
-	private void addOperation(TaskData data, Issue issue,
-			GitHubTaskOperation operation, boolean asDefault) {
-		TaskAttribute attribute = data.getRoot().createAttribute(
-				TaskAttribute.PREFIX_OPERATION + operation.getId());
-		String label = createOperationLabel(issue, operation);
-		TaskOperation.applyTo(attribute, operation.getId(), label);
-
-		if (asDefault) {
-			TaskAttribute operationAttribute = data.getRoot().getAttribute(
-					TaskAttribute.OPERATION);
-			TaskOperation.applyTo(operationAttribute, operation.getId(), label);
-		}
-	}
-
-	private String createOperationLabel(Issue issue,
-			GitHubTaskOperation operation) {
-		return operation == GitHubTaskOperation.LEAVE ? operation.getLabel()
-				+ issue.getState() : operation.getLabel();
-	}
-
-	public TaskData createTaskData(TaskRepository repository,
-			IProgressMonitor monitor, String user, String project, Issue issue,
-			List<Comment> comments) {
-		TaskData taskData = createTaskData(repository, monitor, user, project,
-				issue);
-		taskData.setPartial(false);
-
-		if (comments != null && !comments.isEmpty()) {
-			int count = 1;
-			TaskAttribute root = taskData.getRoot();
-			for (Comment comment : comments) {
-				TaskCommentMapper commentMapper = new TaskCommentMapper();
-				User author = comment.getUser();
-				IRepositoryPerson authorPerson = repository.createPerson(author
-						.getLogin());
-				authorPerson.setName(author.getName());
-				commentMapper.setAuthor(authorPerson);
-				commentMapper.setCreationDate(comment.getCreatedAt());
-				commentMapper.setText(comment.getBody());
-				commentMapper.setCommentId(comment.getUrl());
-				commentMapper.setNumber(count);
-
-				TaskAttribute attribute = root
-						.createAttribute(TaskAttribute.PREFIX_COMMENT + count);
-				commentMapper.applyTo(attribute);
-				count++;
-			}
-		}
-
-		return taskData;
-	}
-
-	private Issue createIssue(TaskData taskData) {
-		Issue issue = new Issue();
-		if (!taskData.isNew()) {
-			issue.setNumber(Integer.parseInt(taskData.getTaskId()));
-		}
-		issue.setBody(getAttributeValue(taskData, GitHubTaskAttributes.BODY));
-		issue.setTitle(getAttributeValue(taskData, GitHubTaskAttributes.TITLE));
-
-		String assigneeValue = getAttributeValue(taskData,
-				GitHubTaskAttributes.ASSIGNEE);
-		if (assigneeValue != null) {
-			if (assigneeValue.trim().length() == 0)
-				assigneeValue = null;
-			User assignee = new User().setName(assigneeValue);
-			issue.setAssignee(assignee);
-		}
-
-		String milestoneValue = getAttributeValue(taskData,
-				GitHubTaskAttributes.MILESTONE);
-		if (milestoneValue != null) {
-			Milestone milestone = new Milestone();
-			if (milestoneValue.length() > 0)
-				milestone.setNumber(Integer.parseInt(milestoneValue));
-			issue.setMilestone(milestone);
-		}
-		return issue;
-	}
-
-	private String getAttributeValue(TaskData taskData,
-			GitHubTaskAttributes attr) {
-		TaskAttribute attribute = taskData.getRoot().getAttribute(attr.getId());
-		return attribute == null ? null : attribute.getValue();
-	}
-
-	private TaskAttribute createAttribute(TaskData data,
-			GitHubTaskAttributes attribute) {
-		TaskAttribute attr = data.getRoot().createAttribute(attribute.getId());
-		TaskAttributeMetaData metaData = attr.getMetaData();
-		metaData.defaults().setType(attribute.getType())
-				.setKind(attribute.getKind()).setLabel(attribute.getLabel())
-				.setReadOnly(attribute.isReadOnly());
-		return attr;
-	}
-
-	private TaskAttribute createAttribute(TaskData data,
-			GitHubTaskAttributes attribute, String value) {
-		TaskAttribute attr = createAttribute(data, attribute);
-		if (value != null) {
-			data.getAttributeMapper().setValue(attr, value);
-		}
-		return attr;
-	}
-
-	private TaskAttribute createAttribute(TaskData data,
-			GitHubTaskAttributes attribute, Date value) {
-		TaskAttribute attr = createAttribute(data, attribute);
-		if (value != null) {
-			data.getAttributeMapper().setDateValue(attr, value);
-		}
-		return attr;
-	}
-
-	private void createAttribute(TaskData data, GitHubTaskAttributes attribute,
-			User value, TaskRepository repository) {
-		TaskAttribute attr = createAttribute(data, attribute);
-		if (value != null) {
-			IRepositoryPerson person = repository
-					.createPerson(value.getLogin());
-			person.setName(value.getName());
-			data.getAttributeMapper().setRepositoryPerson(attr, person);
-		}
-	}
-
-	private TaskAttribute createAttribute(TaskData data,
-			GitHubTaskAttributes attribute, List<Label> values) {
-		TaskAttribute attr = createAttribute(data, attribute);
-		if (values != null) {
-			List<String> labels = new LinkedList<String>();
-			for (Label label : values) {
-				labels.add(label.getName());
-			}
-			data.getAttributeMapper().setValues(attr, labels);
-		}
-		return attr;
-	}
-
-	@Override
-	public boolean initializeTaskData(TaskRepository repository, TaskData data,
-			ITaskMapping initializationData, IProgressMonitor monitor)
-			throws CoreException {
-
-		data.setVersion(DATA_VERSION);
-
-		for (GitHubTaskAttributes attr : GitHubTaskAttributes.values()) {
-			if (attr.isInitTask()) {
-				createAttribute(data, attr, (String) null);
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Update labels for issue
-	 * 
-	 * @param user
-	 * @param repo
-	 * @param client
-	 * @param repository
-	 * @param data
-	 * @param oldAttributes
-	 * @throws IOException
-	 */
-	protected void updateLabels(String user, String repo, GitHubClient client,
-			TaskRepository repository, TaskData data,
-			Set<TaskAttribute> oldAttributes) throws IOException {
-		// Update labels if changed
-		TaskAttribute labelsAttribute = data.getRoot().getAttribute(
-				GitHubTaskAttributes.LABELS.getId());
-		if (oldAttributes.contains(labelsAttribute)) {
-			LabelService labelService = new LabelService(client);
-
-			if (!this.connector.hasCachedLabels(repository))
-				try {
-					this.connector.refreshLabels(repository);
-				} catch (CoreException ignore) {
-					// Ignore
-				}
-			List<Label> currentLabels = this.connector.getLabels(repository);
-			List<Label> newLabels = new LinkedList<Label>();
-			List<Label> labels = new LinkedList<Label>();
-			for (String value : labelsAttribute.getValues()) {
-				Label label = new Label().setName(value);
-				if (!currentLabels.contains(label))
-					newLabels.add(label);
-				labels.add(label);
-			}
-			for (Label label : newLabels)
-				try {
-					labelService.createLabel(user, repo, label);
-				} catch (IOException e) {
-					// TODO detect failure and handle label already created
-				}
-
-			labelService.setLabels(user, repo, data.getTaskId(), labels);
-
-			if (!newLabels.isEmpty())
-				try {
-					this.connector.refreshLabels(repository);
-				} catch (CoreException ignore) {
-					// Ignore
-				}
-
-		}
-	}
-
-	@Override
-	public RepositoryResponse postTaskData(TaskRepository repository,
-			TaskData taskData, Set<TaskAttribute> oldAttributes,
-			IProgressMonitor monitor) throws CoreException {
-		String taskId = taskData.getTaskId();
-		Issue issue = createIssue(taskData);
-		Repository repo = GitHub.getRepository(repository.getRepositoryUrl());
-		try {
-			GitHubClient client = GitHubRepositoryConnector
-					.createClient(repository);
-			IssueService service = new IssueService(client);
-			if (taskData.isNew()) {
-				issue.setState(IssueService.STATE_OPEN);
-				issue = service.createIssue(repo.getOwner(), repo.getName(),
-						issue);
-				taskId = Integer.toString(issue.getNumber());
-			} else {
-
-				// Handle new comment
-				String comment = getAttributeValue(taskData,
-						GitHubTaskAttributes.COMMENT_NEW);
-				if (comment != null && comment.length() > 0)
-					service.createComment(repo.getOwner(), repo.getName(),
-							taskId, comment);
-
-				updateLabels(repo.getOwner(), repo.getName(), client,
-						repository, taskData, oldAttributes);
-
-				// Handle state change
-				TaskAttribute operationAttribute = taskData.getRoot()
-						.getAttribute(TaskAttribute.OPERATION);
-				if (operationAttribute != null) {
-					GitHubTaskOperation operation = GitHubTaskOperation
-							.fromId(operationAttribute.getValue());
-					if (operation != GitHubTaskOperation.LEAVE)
-						switch (operation) {
-						case REOPEN:
-							issue.setState(IssueService.STATE_OPEN);
-							break;
-						case CLOSE:
-							issue.setState(IssueService.STATE_CLOSED);
-							break;
-						default:
-							break;
-						}
-				}
-
-				service.editIssue(repo.getOwner(), repo.getName(), issue);
-			}
-			return new RepositoryResponse(
-					taskData.isNew() ? ResponseKind.TASK_CREATED
-							: ResponseKind.TASK_UPDATED, taskId);
-		} catch (RequestException e) {
-			throw new CoreException(
-					GitHub.createErrorStatus(new GitHubException(e)));
-		} catch (IOException e) {
-			throw new CoreException(GitHub.createErrorStatus(e));
-		}
-
-	}
-}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskOperation.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskOperation.java
deleted file mode 100644
index 58c5b6ea..00000000
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskOperation.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Green <david.green@tasktop.com> - initial contribution
- *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
- *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
- *******************************************************************************/
-package org.eclipse.mylyn.github.internal;
-
-/**
- * Enumeration of task operations
- */
-public enum GitHubTaskOperation {
-
-	/**
-	 * LEAD
-	 */
-	LEAVE("Leave "),
-
-	/**
-	 * REOPEN
-	 */
-	REOPEN("Reopen"),
-
-	/**
-	 * CLOSE
-	 */
-	CLOSE("Close");
-
-	private final String label;
-
-	private GitHubTaskOperation(String label) {
-		this.label = label;
-	}
-
-	/**
-	 * Get label
-	 * 
-	 * @return label
-	 */
-	public String getLabel() {
-		return label;
-	}
-
-	/**
-	 * Get id
-	 * 
-	 * @return id
-	 */
-	public String getId() {
-		return name();
-	}
-
-	/**
-	 * get the operation by its id
-	 * 
-	 * @param opId
-	 *            the id, or null
-	 * @return the operation, or null if the id was null or did not match any
-	 *         operation
-	 */
-	public static GitHubTaskOperation fromId(String opId) {
-		for (GitHubTaskOperation op : values()) {
-			if (op.getId().equals(opId)) {
-				return op;
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/Messages.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/Messages.java
deleted file mode 100644
index 59617861..00000000
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/Messages.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011 GitHub Inc.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *    Kevin Sawicki (GitHub Inc.) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.github.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * NLS for Mylyn GitHub Core
- */
-public class Messages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.github.internal.messages"; //$NON-NLS-1$
-
-	/** */
-	public static String FieldError_InvalidField;
-
-	/** */
-	public static String FieldError_InvalidFieldWithValue;
-
-	/** */
-	public static String FieldError_MissingField;
-
-	/** */
-	public static String FieldError_ResourceError;
-
-	/** */
-	public static String GitHubRepositoryConnector_LabelConnector;
-
-	/** */
-	public static String GitHubRepositoryConnector_TaskQuerying;
-
-	/** */
-	public static String GitHubRepositoryConnector_TaskUpdatingLabels;
-
-	/** */
-	public static String GitHubRepositoryConnector_TaskUpdatingMilestones;
-
-	/** */
-	public static String GitHubTaskAttributes_LabekSummary;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelAssignee;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelAssigneeGravatar;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelClosed;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelComment;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelCreated;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelDescription;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelKey;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelLabels;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelMilestone;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelModified;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelReporter;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelReporterGravatar;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelStatus;
-
-	/** */
-	public static String GitHubTaskDataHandler_MilestoneNone;
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/QueryUtils.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/QueryUtils.java
deleted file mode 100644
index c2496f3d..00000000
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/QueryUtils.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011 GitHub Inc.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *    Kevin Sawicki (GitHub Inc.) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.github.internal;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
-
-/**
- * Utilities for working with {@link IRepositoryQuery} objects.
- * 
- * @author Kevin Sawicki (kevin@github.com)
- */
-public abstract class QueryUtils {
-
-	/**
-	 * DELIMITER
-	 */
-	public static final String DELIMITER = "::"; //$NON-NLS-1$
-
-	/**
-	 * Set attribute
-	 * 
-	 * @param key
-	 * @param values
-	 * @param query
-	 */
-	public static void setAttribute(String key, Collection<String> values,
-			IRepositoryQuery query) {
-		if (key == null || query == null)
-			return;
-
-		if (values != null && !values.isEmpty()) {
-			StringBuilder value = new StringBuilder();
-			for (String entry : values)
-				value.append(entry).append(DELIMITER);
-			query.setAttribute(key, value.toString());
-		} else
-			query.setAttribute(key, null);
-
-	}
-
-	/**
-	 * Get attribute
-	 * 
-	 * @param key
-	 * @param query
-	 * @return non-null but possibly empty list
-	 */
-	public static List<String> getAttributes(String key, IRepositoryQuery query) {
-		if (key == null || query == null)
-			return Collections.emptyList();
-
-		String attribute = query.getAttribute(key);
-		if (attribute == null || attribute.length() == 0)
-			return Collections.emptyList();
-
-		List<String> attrs = new LinkedList<String>();
-		String[] values = attribute.split(DELIMITER);
-		for (String value : values)
-			if (value.length() > 0)
-				attrs.add(value);
-
-		return attrs;
-	}
-
-}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/messages.properties b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/messages.properties
deleted file mode 100644
index 77706e84..00000000
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/messages.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-FieldError_InvalidField=Invalid value for field {1}
-FieldError_InvalidFieldWithValue=Invalid value of {0} for field {1}
-FieldError_MissingField=Missing required field {0}
-FieldError_ResourceError=Error with field {0} in {1} resource
-GitHubRepositoryConnector_LabelConnector=GitHub Issues
-GitHubRepositoryConnector_TaskQuerying=Querying repository...
-GitHubRepositoryConnector_TaskUpdatingLabels=Updating labels
-GitHubRepositoryConnector_TaskUpdatingMilestones=Updating milestones
-GitHubTaskAttributes_LabekSummary=Summary
-GitHubTaskAttributes_LabelAssignee=Assignee:
-GitHubTaskAttributes_LabelAssigneeGravatar=Assignee
-GitHubTaskAttributes_LabelClosed=Closed:
-GitHubTaskAttributes_LabelComment=Comment:
-GitHubTaskAttributes_LabelCreated=Created:
-GitHubTaskAttributes_LabelDescription=Description
-GitHubTaskAttributes_LabelKey=Key
-GitHubTaskAttributes_LabelLabels=Labels:
-GitHubTaskAttributes_LabelMilestone=Milestone:
-GitHubTaskAttributes_LabelModified=Modified:
-GitHubTaskAttributes_LabelReporter=Reporter:
-GitHubTaskAttributes_LabelReporterGravatar=Reporter
-GitHubTaskAttributes_LabelStatus=Status:
-GitHubTaskDataHandler_MilestoneNone=None
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHub.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHub.java
new file mode 100644
index 00000000..6206ad0f
--- /dev/null
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHub.java
@@ -0,0 +1,163 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     David Green <david.green@tasktop.com> - initial contribution
+ *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
+ *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.core;
+
+import java.util.regex.Pattern;
+
+import org.eclipse.core.runtime.ILog;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.egit.github.core.Repository;
+
+/**
+ * GitHub class
+ */
+public class GitHub {
+
+	/** BUNDLE_ID */
+	public static final String BUNDLE_ID = "org.eclipse.mylyn.github.core";
+
+	/** CONNECTOR_KIND */
+	public static final String CONNECTOR_KIND = "github";
+
+	/** HTTP_WWW_GITHUB_ORG */
+	public static final String HTTP_WWW_GITHUB_ORG = "http://www.github.org";
+
+	/** HTTP_GITHUB_COM */
+	public static final String HTTP_GITHUB_COM = "http://github.com";
+
+	/** URL_PATTERN */
+	public static final Pattern URL_PATTERN = Pattern.compile("(?:"
+			+ Pattern.quote(HTTP_WWW_GITHUB_ORG) + "|"
+			+ Pattern.quote(HTTP_GITHUB_COM) + ")/([^/]+)/([^/]+)");
+
+	/**
+	 * Create status of severity with message
+	 * 
+	 * @param severity
+	 * @param message
+	 * @return status
+	 */
+	public static IStatus createStatus(int severity, String message) {
+		return new Status(severity, BUNDLE_ID, message);
+	}
+
+	/**
+	 * Create status of severity with message and throwable
+	 * 
+	 * @param severity
+	 * @param message
+	 * @param e
+	 * @return status
+	 */
+	public static IStatus createStatus(int severity, String message, Throwable e) {
+		return new Status(severity, BUNDLE_ID, message, e);
+	}
+
+	/**
+	 * Create error status from message
+	 * 
+	 * @param message
+	 * @return status
+	 */
+	public static IStatus createErrorStatus(String message) {
+		return createStatus(IStatus.ERROR, message);
+	}
+
+	/**
+	 * Create error status from message and throwable
+	 * 
+	 * @param message
+	 * @param t
+	 * @return status
+	 */
+	public static IStatus createErrorStatus(String message, Throwable t) {
+		return createStatus(IStatus.ERROR, message, t);
+	}
+
+	/**
+	 * Create error status from throwable
+	 * 
+	 * @param e
+	 * @return status
+	 */
+	public static IStatus createErrorStatus(Throwable e) {
+		return createStatus(IStatus.ERROR,
+				"Unexpected error: " + e.getLocalizedMessage(), e);
+	}
+
+	/**
+	 * Get log
+	 * 
+	 * @return log
+	 */
+	public static ILog getLog() {
+		return Platform.getLog(Platform.getBundle(BUNDLE_ID));
+	}
+
+	/**
+	 * Log message and throwable as error status
+	 * 
+	 * @param message
+	 * @param t
+	 */
+	public static void logError(String message, Throwable t) {
+		getLog().log(createErrorStatus(message, t));
+	}
+
+	/**
+	 * Log throwable as error status
+	 * 
+	 * @param t
+	 */
+	public static void logError(Throwable t) {
+		getLog().log(createErrorStatus(t.getMessage(), t));
+	}
+
+	/**
+	 * Get repository for url
+	 * 
+	 * @param repositoryUrl
+	 * @return repository or null if not present in url
+	 */
+	public static Repository getRepository(String repositoryUrl) {
+		return Repository.createFromUrl(repositoryUrl);
+	}
+
+	/**
+	 * Create url with github.com host
+	 * 
+	 * @param user
+	 * @param project
+	 * @return url
+	 * 
+	 * @see #createGitHubUrlAlternate(String, String)
+	 */
+	public static String createGitHubUrl(String user, String project) {
+		return HTTP_GITHUB_COM + '/' + user + '/' + project;
+	}
+
+	/**
+	 * Create url with github.org host
+	 * 
+	 * @param user
+	 * @param project
+	 * @return url
+	 * 
+	 * @see #createGitHubUrl(String, String)
+	 */
+	public static String createGitHubUrlAlternate(String user, String project) {
+		return HTTP_WWW_GITHUB_ORG + '/' + user + '/' + project;
+	}
+}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHubException.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHubException.java
new file mode 100644
index 00000000..a0a58cf7
--- /dev/null
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHubException.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ *  Copyright (c) 2011 GitHub Inc.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *    Kevin Sawicki (GitHub Inc.) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.core;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.List;
+
+import org.eclipse.egit.github.core.FieldError;
+import org.eclipse.egit.github.core.RequestError;
+import org.eclipse.egit.github.core.client.RequestException;
+
+/**
+ * GitHub exception that wraps and formats a {@link RequestException}
+ */
+public class GitHubException extends IOException {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1456910662911777231L;
+
+	/**
+	 * Create GitHub exception from {@link RequestException}
+	 * 
+	 * @param cause
+	 */
+	public GitHubException(RequestException cause) {
+		super(cause);
+	}
+
+	public String getMessage() {
+		RequestError error = ((RequestException) getCause()).getError();
+		StringBuilder message = new StringBuilder(error.getMessage());
+		List<FieldError> errors = error.getErrors();
+		if (errors != null && errors.size() > 0) {
+			message.append(':');
+			for (FieldError fieldError : errors)
+				message.append(' ').append(format(fieldError)).append(',');
+			message.deleteCharAt(message.length() - 1);
+		}
+		return message.toString();
+	}
+
+	private String format(FieldError error) {
+		String code = error.getCode();
+		String value = error.getValue();
+		String field = error.getField();
+		String resource = error.getResource();
+		if (FieldError.CODE_INVALID.equals(code))
+			if (value != null)
+				return MessageFormat
+						.format(Messages.FieldError_InvalidFieldWithValue,
+								value, field);
+			else
+				return MessageFormat.format(Messages.FieldError_InvalidField,
+						field, value);
+		else if (FieldError.CODE_MISSING_FIELD.equals(code))
+			return MessageFormat
+					.format(Messages.FieldError_MissingField, field);
+		else
+			return MessageFormat.format(Messages.FieldError_ResourceError,
+					field, resource);
+	}
+
+}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/Messages.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/Messages.java
new file mode 100644
index 00000000..0c8858bf
--- /dev/null
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/Messages.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ *  Copyright (c) 2011 GitHub Inc.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *    Kevin Sawicki (GitHub Inc.) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.core;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * NLS for Mylyn GitHub Core
+ */
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.github.core.messages"; //$NON-NLS-1$
+
+	/** */
+	public static String FieldError_InvalidField;
+
+	/** */
+	public static String FieldError_InvalidFieldWithValue;
+
+	/** */
+	public static String FieldError_MissingField;
+
+	/** */
+	public static String FieldError_ResourceError;
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/QueryUtils.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/QueryUtils.java
new file mode 100644
index 00000000..85728004
--- /dev/null
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/QueryUtils.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ *  Copyright (c) 2011 GitHub Inc.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ * 
+ *  Contributors:
+ *    Kevin Sawicki (GitHub Inc.) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.core;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
+
+/**
+ * Utilities for working with {@link IRepositoryQuery} objects.
+ * 
+ * @author Kevin Sawicki (kevin@github.com)
+ */
+public abstract class QueryUtils {
+
+	/**
+	 * DELIMITER
+	 */
+	public static final String DELIMITER = "::"; //$NON-NLS-1$
+
+	/**
+	 * Set attribute
+	 * 
+	 * @param key
+	 * @param values
+	 * @param query
+	 */
+	public static void setAttribute(String key, Collection<String> values,
+			IRepositoryQuery query) {
+		if (key == null || query == null)
+			return;
+
+		if (values != null && !values.isEmpty()) {
+			StringBuilder value = new StringBuilder();
+			for (String entry : values)
+				value.append(entry).append(DELIMITER);
+			query.setAttribute(key, value.toString());
+		} else
+			query.setAttribute(key, null);
+
+	}
+
+	/**
+	 * Get attribute
+	 * 
+	 * @param key
+	 * @param query
+	 * @return non-null but possibly empty list
+	 */
+	public static List<String> getAttributes(String key, IRepositoryQuery query) {
+		if (key == null || query == null)
+			return Collections.emptyList();
+
+		String attribute = query.getAttribute(key);
+		if (attribute == null || attribute.length() == 0)
+			return Collections.emptyList();
+
+		List<String> attrs = new LinkedList<String>();
+		String[] values = attribute.split(DELIMITER);
+		for (String value : values)
+			if (value.length() > 0)
+				attrs.add(value);
+
+		return attrs;
+	}
+
+}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistAttachmentHandler.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistAttachmentHandler.java
index 172c9332..09609f7e 100644
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistAttachmentHandler.java
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistAttachmentHandler.java
@@ -24,7 +24,7 @@ import org.eclipse.egit.github.core.client.GitHubRequest;
 import org.eclipse.egit.github.core.service.GistService;
 import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
 import org.eclipse.mylyn.commons.net.AuthenticationType;
-import org.eclipse.mylyn.github.internal.GitHub;
+import org.eclipse.mylyn.internal.github.core.GitHub;
 import org.eclipse.mylyn.tasks.core.ITask;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.core.data.AbstractTaskAttachmentHandler;
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistConnector.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistConnector.java
index fe3760bc..f92c6d1a 100644
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistConnector.java
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistConnector.java
@@ -22,7 +22,7 @@ import org.eclipse.egit.github.core.client.GitHubClient;
 import org.eclipse.egit.github.core.service.GistService;
 import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
 import org.eclipse.mylyn.commons.net.AuthenticationType;
-import org.eclipse.mylyn.github.internal.GitHub;
+import org.eclipse.mylyn.internal.github.core.GitHub;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
 import org.eclipse.mylyn.tasks.core.ITask;
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistTaskDataHandler.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistTaskDataHandler.java
index a09539e9..e68a2900 100644
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistTaskDataHandler.java
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistTaskDataHandler.java
@@ -27,8 +27,8 @@ import org.eclipse.egit.github.core.client.GitHubClient;
 import org.eclipse.egit.github.core.service.GistService;
 import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
 import org.eclipse.mylyn.commons.net.AuthenticationType;
-import org.eclipse.mylyn.github.internal.GitHub;
-import org.eclipse.mylyn.github.internal.GitHubTaskAttributeMapper;
+import org.eclipse.mylyn.internal.github.core.GitHub;
+import org.eclipse.mylyn.internal.github.core.issue.IssueAttributeMapper;
 import org.eclipse.mylyn.tasks.core.IRepositoryPerson;
 import org.eclipse.mylyn.tasks.core.ITaskMapping;
 import org.eclipse.mylyn.tasks.core.RepositoryResponse;
@@ -274,7 +274,7 @@ public class GistTaskDataHandler extends AbstractTaskDataHandler {
 	 * @see org.eclipse.mylyn.tasks.core.data.AbstractTaskDataHandler#getAttributeMapper(org.eclipse.mylyn.tasks.core.TaskRepository)
 	 */
 	public TaskAttributeMapper getAttributeMapper(TaskRepository taskRepository) {
-		return new GitHubTaskAttributeMapper(taskRepository);
+		return new IssueAttributeMapper(taskRepository);
 	}
 
 }
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueAttribute.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueAttribute.java
new file mode 100644
index 00000000..8c97c965
--- /dev/null
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueAttribute.java
@@ -0,0 +1,190 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     David Green <david.green@tasktop.com> - initial contribution
+ *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
+ *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.core.issue;
+
+import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
+
+/**
+ * GitHub issue task attributes
+ */
+public enum IssueAttribute {
+
+	/**
+	 * Issue key
+	 */
+	KEY(Messages.IssueAttribute_LabelKey, TaskAttribute.TASK_KEY,
+			TaskAttribute.TYPE_SHORT_TEXT, true, true),
+
+	/**
+	 * Issue title
+	 */
+	TITLE(Messages.IssueAttribute_LabekSummary, TaskAttribute.SUMMARY,
+			TaskAttribute.TYPE_SHORT_RICH_TEXT, false, true),
+
+	/**
+	 * Issue description
+	 */
+	BODY(Messages.IssueAttribute_LabelDescription,
+			TaskAttribute.DESCRIPTION, TaskAttribute.TYPE_LONG_RICH_TEXT,
+			false, true),
+
+	/**
+	 * Issue creation date
+	 */
+	CREATION_DATE(Messages.IssueAttribute_LabelCreated,
+			TaskAttribute.DATE_CREATION, TaskAttribute.TYPE_DATETIME, true,
+			false),
+
+	/**
+	 * Issue modification date
+	 */
+	MODIFICATION_DATE(Messages.IssueAttribute_LabelModified,
+			TaskAttribute.DATE_MODIFICATION, TaskAttribute.TYPE_DATETIME, true,
+			false),
+
+	/**
+	 * Issue closed date
+	 */
+	CLOSED_DATE(Messages.IssueAttribute_LabelClosed,
+			TaskAttribute.DATE_COMPLETION, TaskAttribute.TYPE_DATETIME, true,
+			false),
+
+	/**
+	 * Issue status
+	 */
+	STATUS(Messages.IssueAttribute_LabelStatus, TaskAttribute.STATUS,
+			TaskAttribute.TYPE_SHORT_TEXT, false, true),
+
+	/**
+	 * Issue reporter
+	 */
+	REPORTER(Messages.IssueAttribute_LabelReporter,
+			TaskAttribute.USER_REPORTER, TaskAttribute.TYPE_PERSON, true, false),
+
+	/**
+	 * Comment being added to issue
+	 */
+	COMMENT_NEW(Messages.IssueAttribute_LabelComment,
+			TaskAttribute.COMMENT_NEW, TaskAttribute.TYPE_LONG_RICH_TEXT,
+			false, false),
+
+	/**
+	 * Labels applied to issue
+	 */
+	LABELS(Messages.IssueAttribute_LabelLabels, "github.issue.labels", //$NON-NLS-1$
+			TaskAttribute.TYPE_MULTI_SELECT, true, false),
+
+	/**
+	 * Issue assignee
+	 */
+	ASSIGNEE(Messages.IssueAttribute_LabelAssignee,
+			TaskAttribute.USER_ASSIGNED, TaskAttribute.TYPE_PERSON, false, true),
+
+	/**
+	 * Issue milestone
+	 */
+	MILESTONE(Messages.IssueAttribute_LabelMilestone,
+			"github.issue.milestone", TaskAttribute.TYPE_SINGLE_SELECT, //$NON-NLS-1$
+			false, true),
+
+	/**
+	 * Issue assignee gravatar
+	 */
+	ASSIGNEE_GRAVATAR(Messages.IssueAttribute_LabelAssigneeGravatar,
+			"github.issue.assignee.gravatar", TaskAttribute.TYPE_URL, null, //$NON-NLS-1$
+			true, false),
+
+	/**
+	 * Issue reporter gravatar
+	 */
+	REPORTER_GRAVATAR(Messages.IssueAttribute_LabelReporterGravatar,
+			"github.issue.reporter.gravatar", TaskAttribute.TYPE_URL, null, //$NON-NLS-1$
+			true, false);
+
+	private final String id;
+	private final String label;
+	private final String kind;
+	private final boolean readOnly;
+	private final boolean initTask;
+	private final String type;
+
+	private IssueAttribute(String label, String id, String type,
+			boolean readOnly, boolean initTask) {
+		this(label, id, type, TaskAttribute.KIND_DEFAULT, readOnly, initTask);
+	}
+
+	private IssueAttribute(String label, String id, String type,
+			String kind, boolean readOnly, boolean initTask) {
+		this.label = label;
+		this.id = id;
+		this.kind = kind;
+		this.type = type;
+		this.readOnly = readOnly;
+		this.initTask = initTask;
+	}
+
+	/**
+	 * Get attribute label
+	 * 
+	 * @return label
+	 */
+	public String getLabel() {
+		return label;
+	}
+
+	/**
+	 * Get attribute id
+	 * 
+	 * @return id
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * Get attribute type
+	 * 
+	 * @return type
+	 */
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * Is attribute read only?
+	 * 
+	 * @return true if read only, false otherwise
+	 */
+	public boolean isReadOnly() {
+		return readOnly;
+	}
+
+	/**
+	 * Get attribute kind
+	 * 
+	 * @return kind
+	 */
+	public String getKind() {
+		return this.kind;
+	}
+
+	/**
+	 * Is this attribute created for new tasks?
+	 * 
+	 * @return true if needed for new tasks, false otherwise
+	 */
+	public boolean isInitTask() {
+		return initTask;
+	}
+
+}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueAttributeMapper.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueAttributeMapper.java
new file mode 100644
index 00000000..e4038af7
--- /dev/null
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueAttributeMapper.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     David Green <david.green@tasktop.com> - initial contribution
+ *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
+ *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.core.issue;
+
+import java.text.DateFormat;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+import org.eclipse.mylyn.tasks.core.TaskRepository;
+import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
+import org.eclipse.mylyn.tasks.core.data.TaskAttributeMapper;
+
+/**
+ * GitHub task attribute mapper class.
+ */
+public class IssueAttributeMapper extends TaskAttributeMapper {
+
+	private DateFormat format = DateFormat.getDateTimeInstance(
+			DateFormat.MEDIUM, DateFormat.SHORT);
+
+	/**
+	 * @param taskRepository
+	 */
+	public IssueAttributeMapper(TaskRepository taskRepository) {
+		super(taskRepository);
+	}
+
+	/**
+	 * @see org.eclipse.mylyn.tasks.core.data.TaskAttributeMapper#getValueLabels(org.eclipse.mylyn.tasks.core.data.TaskAttribute)
+	 */
+	public List<String> getValueLabels(TaskAttribute taskAttribute) {
+		String type = taskAttribute.getMetaData().getType();
+		if (TaskAttribute.TYPE_DATE.equals(type)
+				|| TaskAttribute.TYPE_DATETIME.equals(type)) {
+			String value = taskAttribute.getValue();
+			if (value.length() > 0) {
+				Date date = new Date(Long.parseLong(value));
+				synchronized (this.format) {
+					value = this.format.format(date);
+				}
+				return Collections.singletonList(value);
+			}
+		}
+		return super.getValueLabels(taskAttribute);
+	}
+}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueConnector.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueConnector.java
new file mode 100644
index 00000000..274c4bcc
--- /dev/null
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueConnector.java
@@ -0,0 +1,413 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     David Green <david.green@tasktop.com> - initial contribution
+ *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
+ *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.core.issue;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.egit.github.core.Comment;
+import org.eclipse.egit.github.core.Issue;
+import org.eclipse.egit.github.core.Label;
+import org.eclipse.egit.github.core.Milestone;
+import org.eclipse.egit.github.core.Repository;
+import org.eclipse.egit.github.core.client.GitHubClient;
+import org.eclipse.egit.github.core.client.RequestException;
+import org.eclipse.egit.github.core.service.IssueService;
+import org.eclipse.egit.github.core.service.LabelService;
+import org.eclipse.egit.github.core.service.MilestoneService;
+import org.eclipse.egit.github.core.util.LabelComparator;
+import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
+import org.eclipse.mylyn.commons.net.AuthenticationType;
+import org.eclipse.mylyn.commons.net.Policy;
+import org.eclipse.mylyn.internal.github.core.GitHub;
+import org.eclipse.mylyn.internal.github.core.GitHubException;
+import org.eclipse.mylyn.internal.github.core.QueryUtils;
+import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
+import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
+import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.TaskRepository;
+import org.eclipse.mylyn.tasks.core.data.AbstractTaskDataHandler;
+import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
+import org.eclipse.mylyn.tasks.core.data.TaskData;
+import org.eclipse.mylyn.tasks.core.data.TaskDataCollector;
+import org.eclipse.mylyn.tasks.core.data.TaskMapper;
+import org.eclipse.mylyn.tasks.core.sync.ISynchronizationSession;
+
+/**
+ * GitHub connector.
+ */
+public class IssueConnector extends AbstractRepositoryConnector {
+
+	/**
+	 * GitHub kind.
+	 */
+	public static final String KIND = GitHub.CONNECTOR_KIND;
+
+	/**
+	 * Create client for repository
+	 * 
+	 * @param repository
+	 * @return client
+	 */
+	public static GitHubClient createClient(TaskRepository repository) {
+		GitHubClient client = new GitHubClient();
+		AuthenticationCredentials credentials = repository
+				.getCredentials(AuthenticationType.REPOSITORY);
+		if (credentials != null)
+			client.setCredentials(credentials.getUserName(),
+					credentials.getPassword());
+		return client;
+	}
+
+	/**
+	 * GitHub specific {@link AbstractTaskDataHandler}.
+	 */
+	private final IssueTaskDataHandler taskDataHandler;
+
+	private final Map<TaskRepository, List<Label>> repositoryLabels = Collections
+			.synchronizedMap(new HashMap<TaskRepository, List<Label>>());
+
+	private final Map<TaskRepository, List<Milestone>> repositoryMilestones = Collections
+			.synchronizedMap(new HashMap<TaskRepository, List<Milestone>>());
+
+	/**
+	 * Create GitHub issue repository connector
+	 */
+	public IssueConnector() {
+		taskDataHandler = new IssueTaskDataHandler(this);
+	}
+
+	/**
+	 * Refresh labels for repository
+	 * 
+	 * @param repository
+	 * @return labels
+	 * @throws CoreException
+	 */
+	public List<Label> refreshLabels(TaskRepository repository)
+			throws CoreException {
+		Assert.isNotNull(repository, "Repository cannot be null"); //$NON-NLS-1$
+		Repository repo = GitHub.getRepository(repository.getRepositoryUrl());
+		GitHubClient client = createClient(repository);
+		LabelService service = new LabelService(client);
+		try {
+			List<Label> labels = service.getLabels(repo.getOwner(),
+					repo.getName());
+			Collections.sort(labels, new LabelComparator());
+			this.repositoryLabels.put(repository, labels);
+			return labels;
+		} catch (IOException e) {
+			throw new CoreException(GitHub.createErrorStatus(e));
+		}
+	}
+
+	/**
+	 * Get labels for task repository.
+	 * 
+	 * @param repository
+	 * @return non-null but possibly empty list of labels
+	 */
+	public List<Label> getLabels(TaskRepository repository) {
+		Assert.isNotNull(repository, "Repository cannot be null"); //$NON-NLS-1$
+		List<Label> labels = new LinkedList<Label>();
+		List<Label> cached = this.repositoryLabels.get(repository);
+		if (cached != null) {
+			labels.addAll(cached);
+		}
+		return labels;
+	}
+
+	/**
+	 * Are there cached labels for the specified task repository?
+	 * 
+	 * @param repository
+	 * @return true if contains labels, false otherwise
+	 */
+	public boolean hasCachedLabels(TaskRepository repository) {
+		return this.repositoryLabels.containsKey(repository);
+	}
+
+	/**
+	 * Refresh milestones for repository
+	 * 
+	 * @param repository
+	 * @return milestones
+	 * @throws CoreException
+	 */
+	public List<Milestone> refreshMilestones(TaskRepository repository)
+			throws CoreException {
+		Assert.isNotNull(repository, "Repository cannot be null"); //$NON-NLS-1$
+		Repository repo = GitHub.getRepository(repository.getRepositoryUrl());
+		GitHubClient client = createClient(repository);
+		MilestoneService service = new MilestoneService(client);
+		try {
+			List<Milestone> milestones = new LinkedList<Milestone>();
+			milestones.addAll(service.getMilestones(repo.getOwner(),
+					repo.getName(), IssueService.STATE_OPEN));
+			milestones.addAll(service.getMilestones(repo.getOwner(),
+					repo.getName(), IssueService.STATE_CLOSED));
+			this.repositoryMilestones.put(repository, milestones);
+			return milestones;
+		} catch (IOException e) {
+			throw new CoreException(GitHub.createErrorStatus(e));
+		}
+	}
+
+	/**
+	 * Get milestones for task repository.
+	 * 
+	 * @param repository
+	 * @return non-null but possibly empty list of milestones
+	 */
+	public List<Milestone> getMilestones(TaskRepository repository) {
+		Assert.isNotNull(repository, "Repository cannot be null"); //$NON-NLS-1$
+		List<Milestone> milestones = new LinkedList<Milestone>();
+		List<Milestone> cached = this.repositoryMilestones.get(repository);
+		if (cached != null) {
+			milestones.addAll(cached);
+		}
+		return milestones;
+	}
+
+	/**
+	 * Are there cached milestones for the specified task repository?
+	 * 
+	 * @param repository
+	 * @return true if contains milestones, false otherwise
+	 */
+	public boolean hasCachedMilestones(TaskRepository repository) {
+		return this.repositoryMilestones.containsKey(repository);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @return always {@code true}
+	 */
+	@Override
+	public boolean canCreateNewTask(TaskRepository repository) {
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @return always {@code true}
+	 */
+	@Override
+	public boolean canCreateTaskFromKey(TaskRepository repository) {
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see #KIND
+	 */
+	@Override
+	public String getConnectorKind() {
+		return KIND;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getLabel() {
+		return Messages.IssueConnector_LabelConnector;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AbstractTaskDataHandler getTaskDataHandler() {
+		return this.taskDataHandler;
+	}
+
+	@Override
+	public IStatus performQuery(TaskRepository repository,
+			IRepositoryQuery query, TaskDataCollector collector,
+			ISynchronizationSession session, IProgressMonitor monitor) {
+		IStatus result = Status.OK_STATUS;
+		List<String> statuses = QueryUtils.getAttributes(
+				IssueService.FILTER_STATE, query);
+
+		monitor.beginTask(Messages.IssueConector_TaskQuerying,
+				statuses.size());
+		try {
+			Repository repo = GitHub.getRepository(repository
+					.getRepositoryUrl());
+
+			GitHubClient client = createClient(repository);
+			IssueService service = new IssueService(client);
+
+			Map<String, String> filterData = new HashMap<String, String>();
+			String mentions = query.getAttribute(IssueService.FILTER_MENTIONED);
+			if (mentions != null)
+				filterData.put(IssueService.FILTER_MENTIONED, mentions);
+
+			String assignee = query.getAttribute(IssueService.FILTER_ASSIGNEE);
+			if (assignee != null)
+				filterData.put(IssueService.FILTER_ASSIGNEE, assignee);
+
+			String milestone = query
+					.getAttribute(IssueService.FILTER_MILESTONE);
+			if (milestone != null)
+				filterData.put(IssueService.FILTER_MILESTONE, milestone);
+
+			List<String> labels = QueryUtils.getAttributes(
+					IssueService.FILTER_LABELS, query);
+			if (!labels.isEmpty()) {
+				StringBuilder labelsQuery = new StringBuilder();
+				for (String label : labels)
+					labelsQuery.append(label).append(',');
+				filterData.put(IssueService.FILTER_LABELS,
+						labelsQuery.toString());
+			}
+
+			for (String status : statuses) {
+				filterData.put(IssueService.FILTER_STATE, status);
+				List<Issue> issues = service.getIssues(repo.getOwner(),
+						repo.getName(), filterData);
+
+				// collect task data
+				for (Issue issue : issues) {
+					TaskData taskData = taskDataHandler.createTaskData(
+							repository, monitor, repo.getOwner(),
+							repo.getName(), issue);
+					taskData.setPartial(true);
+					collector.accept(taskData);
+				}
+				monitor.worked(1);
+			}
+
+			result = Status.OK_STATUS;
+		} catch (RequestException e) {
+			result = GitHub.createErrorStatus(new GitHubException(e));
+		} catch (IOException e) {
+			result = GitHub.createErrorStatus(e);
+		}
+
+		monitor.done();
+		return result;
+	}
+
+	@Override
+	public TaskData getTaskData(TaskRepository repository, String taskId,
+			IProgressMonitor monitor) throws CoreException {
+		Repository repo = GitHub.getRepository(repository.getRepositoryUrl());
+
+		try {
+			GitHubClient client = createClient(repository);
+			IssueService service = new IssueService(client);
+			Issue issue = service.getIssue(repo.getOwner(), repo.getName(),
+					taskId);
+			List<Comment> comments = null;
+			if (issue.getComments() > 0) {
+				comments = service.getComments(repo.getOwner(), repo.getName(),
+						taskId);
+			}
+			TaskData taskData = taskDataHandler.createTaskData(repository,
+					monitor, repo.getOwner(), repo.getName(), issue, comments);
+
+			return taskData;
+		} catch (IOException e) {
+			throw new CoreException(GitHub.createErrorStatus(e));
+		}
+	}
+
+	@Override
+	public String getRepositoryUrlFromTaskUrl(String taskFullUrl) {
+		if (taskFullUrl != null) {
+			Matcher matcher = Pattern.compile(
+					"(http://.+?)/issues/issue/([^/]+)").matcher(taskFullUrl); //$NON-NLS-1$
+			if (matcher.matches()) {
+				return matcher.group(1);
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public String getTaskIdFromTaskUrl(String taskFullUrl) {
+		if (taskFullUrl != null) {
+			Matcher matcher = Pattern
+					.compile(".+?/issues/issue/([^/]+)").matcher(taskFullUrl); //$NON-NLS-1$
+			if (matcher.matches()) {
+				return matcher.group(1);
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public String getTaskUrl(String repositoryUrl, String taskId) {
+		return repositoryUrl + "/issues/issue/" + taskId; //$NON-NLS-1$
+	}
+
+	@Override
+	public void updateRepositoryConfiguration(TaskRepository taskRepository,
+			IProgressMonitor monitor) throws CoreException {
+		monitor = Policy.monitorFor(monitor);
+		monitor.beginTask("", 2); //$NON-NLS-1$
+		monitor.setTaskName(Messages.IssueConnector_TaskUpdatingLabels);
+		refreshLabels(taskRepository);
+		monitor.worked(1);
+		monitor.setTaskName(Messages.IssueConnector_TaskUpdatingMilestones);
+		refreshMilestones(taskRepository);
+		monitor.done();
+	}
+
+	@Override
+	public boolean hasTaskChanged(TaskRepository repository, ITask task,
+			TaskData taskData) {
+		TaskAttribute modAttribute = taskData.getRoot().getAttribute(
+				TaskAttribute.DATE_MODIFICATION);
+		if (modAttribute == null)
+			return false;
+
+		boolean changed = true;
+		Date modDate = task.getModificationDate();
+		if (modDate != null) {
+			Date updateDate = taskData.getAttributeMapper().getDateValue(
+					modAttribute);
+			if (updateDate != null)
+				changed = updateDate.after(modDate);
+		}
+		return changed;
+	}
+
+	@Override
+	public void updateTaskFromTaskData(TaskRepository taskRepository,
+			ITask task, TaskData taskData) {
+		if (!taskData.isNew()) {
+			task.setUrl(getTaskUrl(taskRepository.getUrl(),
+					taskData.getTaskId()));
+		}
+		new TaskMapper(taskData).applyTo(task);
+	}
+
+}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueOperation.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueOperation.java
new file mode 100644
index 00000000..d851919d
--- /dev/null
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueOperation.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     David Green <david.green@tasktop.com> - initial contribution
+ *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
+ *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.core.issue;
+
+/**
+ * Enumeration of task operations
+ */
+public enum IssueOperation {
+
+	/**
+	 * LEAD
+	 */
+	LEAVE("Leave "),
+
+	/**
+	 * REOPEN
+	 */
+	REOPEN("Reopen"),
+
+	/**
+	 * CLOSE
+	 */
+	CLOSE("Close");
+
+	private final String label;
+
+	private IssueOperation(String label) {
+		this.label = label;
+	}
+
+	/**
+	 * Get label
+	 * 
+	 * @return label
+	 */
+	public String getLabel() {
+		return label;
+	}
+
+	/**
+	 * Get id
+	 * 
+	 * @return id
+	 */
+	public String getId() {
+		return name();
+	}
+
+	/**
+	 * get the operation by its id
+	 * 
+	 * @param opId
+	 *            the id, or null
+	 * @return the operation, or null if the id was null or did not match any
+	 *         operation
+	 */
+	public static IssueOperation fromId(String opId) {
+		for (IssueOperation op : values()) {
+			if (op.getId().equals(opId)) {
+				return op;
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueTaskDataHandler.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueTaskDataHandler.java
new file mode 100644
index 00000000..3cb43c81
--- /dev/null
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueTaskDataHandler.java
@@ -0,0 +1,449 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     David Green <david.green@tasktop.com> - initial contribution
+ *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
+ *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.core.issue;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.egit.github.core.Comment;
+import org.eclipse.egit.github.core.Issue;
+import org.eclipse.egit.github.core.Label;
+import org.eclipse.egit.github.core.Milestone;
+import org.eclipse.egit.github.core.Repository;
+import org.eclipse.egit.github.core.User;
+import org.eclipse.egit.github.core.client.GitHubClient;
+import org.eclipse.egit.github.core.client.RequestException;
+import org.eclipse.egit.github.core.service.IssueService;
+import org.eclipse.egit.github.core.service.LabelService;
+import org.eclipse.mylyn.internal.github.core.GitHub;
+import org.eclipse.mylyn.internal.github.core.GitHubException;
+import org.eclipse.mylyn.tasks.core.IRepositoryPerson;
+import org.eclipse.mylyn.tasks.core.ITaskMapping;
+import org.eclipse.mylyn.tasks.core.RepositoryResponse;
+import org.eclipse.mylyn.tasks.core.RepositoryResponse.ResponseKind;
+import org.eclipse.mylyn.tasks.core.TaskRepository;
+import org.eclipse.mylyn.tasks.core.data.AbstractTaskDataHandler;
+import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
+import org.eclipse.mylyn.tasks.core.data.TaskAttributeMapper;
+import org.eclipse.mylyn.tasks.core.data.TaskAttributeMetaData;
+import org.eclipse.mylyn.tasks.core.data.TaskCommentMapper;
+import org.eclipse.mylyn.tasks.core.data.TaskData;
+import org.eclipse.mylyn.tasks.core.data.TaskOperation;
+
+/**
+ * GitHub issue task data handler
+ */
+public class IssueTaskDataHandler extends AbstractTaskDataHandler {
+
+	private static final String DATA_VERSION = "1"; //$NON-NLS-1$
+	private static final String MILESTONE_NONE_KEY = "0"; //$NON-NLS-1$
+	private IssueAttributeMapper taskAttributeMapper = null;
+	private final IssueConnector connector;
+
+	/**
+	 * Create GitHub issue task data handler for connector
+	 * 
+	 * @param connector
+	 */
+	public IssueTaskDataHandler(IssueConnector connector) {
+		this.connector = connector;
+	}
+
+	@Override
+	public TaskAttributeMapper getAttributeMapper(TaskRepository taskRepository) {
+		if (this.taskAttributeMapper == null)
+			this.taskAttributeMapper = new IssueAttributeMapper(
+					taskRepository);
+		return this.taskAttributeMapper;
+	}
+
+	public TaskData createTaskData(TaskRepository repository,
+			IProgressMonitor monitor, String user, String project, Issue issue) {
+
+		String key = Integer.toString(issue.getNumber());
+		TaskData data = new TaskData(getAttributeMapper(repository),
+				IssueConnector.KIND, repository.getRepositoryUrl(),
+				key);
+		data.setVersion(DATA_VERSION);
+
+		createOperations(data, issue);
+
+		createAttribute(data, IssueAttribute.KEY, key);
+		createAttribute(data, IssueAttribute.TITLE, issue.getTitle());
+		createAttribute(data, IssueAttribute.BODY, issue.getBody());
+		createAttribute(data, IssueAttribute.STATUS, issue.getState());
+		createAttribute(data, IssueAttribute.CREATION_DATE,
+				issue.getCreatedAt());
+		createAttribute(data, IssueAttribute.MODIFICATION_DATE,
+				issue.getUpdatedAt());
+		createAttribute(data, IssueAttribute.CLOSED_DATE,
+				issue.getClosedAt());
+
+		User reporter = issue.getUser();
+		createAttribute(data, IssueAttribute.REPORTER, reporter,
+				repository);
+		String reporterGravatar = reporter != null ? reporter.getGravatarUrl()
+				: null;
+		createAttribute(data, IssueAttribute.REPORTER_GRAVATAR,
+				reporterGravatar);
+
+		User assignee = issue.getAssignee();
+		createAttribute(data, IssueAttribute.ASSIGNEE, assignee,
+				repository);
+		String assigneeGravatar = assignee != null ? assignee.getGravatarUrl()
+				: null;
+		createAttribute(data, IssueAttribute.ASSIGNEE_GRAVATAR,
+				assigneeGravatar);
+
+		createAttribute(data, IssueAttribute.COMMENT_NEW);
+
+		createLabels(repository, data, issue);
+
+		createMilestone(repository, data, issue);
+
+		return data;
+	}
+
+	private void createMilestone(TaskRepository repository, TaskData data,
+			Issue issue) {
+		Milestone current = issue.getMilestone();
+		String number = current != null ? Integer.toString(current.getNumber())
+				: MILESTONE_NONE_KEY;
+		TaskAttribute milestoneAttribute = createAttribute(data,
+				IssueAttribute.MILESTONE, number);
+
+		if (!this.connector.hasCachedMilestones(repository))
+			try {
+				this.connector.refreshMilestones(repository);
+			} catch (CoreException ignore) {
+				// Ignored
+			}
+
+		List<Milestone> cachedMilestones = this.connector
+				.getMilestones(repository);
+		milestoneAttribute.putOption(MILESTONE_NONE_KEY,
+				Messages.IssueAttribute_MilestoneNone);
+		for (Milestone milestone : cachedMilestones)
+			milestoneAttribute.putOption(
+					Integer.toString(milestone.getNumber()),
+					milestone.getTitle());
+	}
+
+	private void createLabels(TaskRepository repository, TaskData data,
+			Issue issue) {
+		TaskAttribute labels = createAttribute(data,
+				IssueAttribute.LABELS, issue.getLabels());
+
+		if (!this.connector.hasCachedLabels(repository))
+			try {
+				this.connector.refreshLabels(repository);
+			} catch (CoreException ignore) {
+				// Ignored
+			}
+
+		List<Label> cachedLabels = this.connector.getLabels(repository);
+		for (Label label : cachedLabels)
+			labels.putOption(label.getName(), label.getName());
+	}
+
+	private void createOperations(TaskData data, Issue issue) {
+		TaskAttribute operationAttribute = data.getRoot().createAttribute(
+				TaskAttribute.OPERATION);
+		operationAttribute.getMetaData().setType(TaskAttribute.TYPE_OPERATION);
+
+		if (!data.isNew()) {
+			String state = issue.getState();
+			if (state != null) {
+				addOperation(data, issue, IssueOperation.LEAVE, true);
+				if (state.equals(IssueService.STATE_OPEN))
+					addOperation(data, issue, IssueOperation.CLOSE, false);
+				else if (state.equals(IssueService.STATE_CLOSED))
+					addOperation(data, issue, IssueOperation.REOPEN, false);
+			}
+		}
+	}
+
+	private void addOperation(TaskData data, Issue issue,
+			IssueOperation operation, boolean asDefault) {
+		TaskAttribute attribute = data.getRoot().createAttribute(
+				TaskAttribute.PREFIX_OPERATION + operation.getId());
+		String label = createOperationLabel(issue, operation);
+		TaskOperation.applyTo(attribute, operation.getId(), label);
+
+		if (asDefault) {
+			TaskAttribute operationAttribute = data.getRoot().getAttribute(
+					TaskAttribute.OPERATION);
+			TaskOperation.applyTo(operationAttribute, operation.getId(), label);
+		}
+	}
+
+	private String createOperationLabel(Issue issue,
+			IssueOperation operation) {
+		return operation == IssueOperation.LEAVE ? operation.getLabel()
+				+ issue.getState() : operation.getLabel();
+	}
+
+	public TaskData createTaskData(TaskRepository repository,
+			IProgressMonitor monitor, String user, String project, Issue issue,
+			List<Comment> comments) {
+		TaskData taskData = createTaskData(repository, monitor, user, project,
+				issue);
+		taskData.setPartial(false);
+
+		if (comments != null && !comments.isEmpty()) {
+			int count = 1;
+			TaskAttribute root = taskData.getRoot();
+			for (Comment comment : comments) {
+				TaskCommentMapper commentMapper = new TaskCommentMapper();
+				User author = comment.getUser();
+				IRepositoryPerson authorPerson = repository.createPerson(author
+						.getLogin());
+				authorPerson.setName(author.getName());
+				commentMapper.setAuthor(authorPerson);
+				commentMapper.setCreationDate(comment.getCreatedAt());
+				commentMapper.setText(comment.getBody());
+				commentMapper.setCommentId(comment.getUrl());
+				commentMapper.setNumber(count);
+
+				TaskAttribute attribute = root
+						.createAttribute(TaskAttribute.PREFIX_COMMENT + count);
+				commentMapper.applyTo(attribute);
+				count++;
+			}
+		}
+
+		return taskData;
+	}
+
+	private Issue createIssue(TaskData taskData) {
+		Issue issue = new Issue();
+		if (!taskData.isNew()) {
+			issue.setNumber(Integer.parseInt(taskData.getTaskId()));
+		}
+		issue.setBody(getAttributeValue(taskData, IssueAttribute.BODY));
+		issue.setTitle(getAttributeValue(taskData, IssueAttribute.TITLE));
+
+		String assigneeValue = getAttributeValue(taskData,
+				IssueAttribute.ASSIGNEE);
+		if (assigneeValue != null) {
+			if (assigneeValue.trim().length() == 0)
+				assigneeValue = null;
+			User assignee = new User().setName(assigneeValue);
+			issue.setAssignee(assignee);
+		}
+
+		String milestoneValue = getAttributeValue(taskData,
+				IssueAttribute.MILESTONE);
+		if (milestoneValue != null) {
+			Milestone milestone = new Milestone();
+			if (milestoneValue.length() > 0)
+				milestone.setNumber(Integer.parseInt(milestoneValue));
+			issue.setMilestone(milestone);
+		}
+		return issue;
+	}
+
+	private String getAttributeValue(TaskData taskData,
+			IssueAttribute attr) {
+		TaskAttribute attribute = taskData.getRoot().getAttribute(attr.getId());
+		return attribute == null ? null : attribute.getValue();
+	}
+
+	private TaskAttribute createAttribute(TaskData data,
+			IssueAttribute attribute) {
+		TaskAttribute attr = data.getRoot().createAttribute(attribute.getId());
+		TaskAttributeMetaData metaData = attr.getMetaData();
+		metaData.defaults().setType(attribute.getType())
+				.setKind(attribute.getKind()).setLabel(attribute.getLabel())
+				.setReadOnly(attribute.isReadOnly());
+		return attr;
+	}
+
+	private TaskAttribute createAttribute(TaskData data,
+			IssueAttribute attribute, String value) {
+		TaskAttribute attr = createAttribute(data, attribute);
+		if (value != null) {
+			data.getAttributeMapper().setValue(attr, value);
+		}
+		return attr;
+	}
+
+	private TaskAttribute createAttribute(TaskData data,
+			IssueAttribute attribute, Date value) {
+		TaskAttribute attr = createAttribute(data, attribute);
+		if (value != null) {
+			data.getAttributeMapper().setDateValue(attr, value);
+		}
+		return attr;
+	}
+
+	private void createAttribute(TaskData data, IssueAttribute attribute,
+			User value, TaskRepository repository) {
+		TaskAttribute attr = createAttribute(data, attribute);
+		if (value != null) {
+			IRepositoryPerson person = repository
+					.createPerson(value.getLogin());
+			person.setName(value.getName());
+			data.getAttributeMapper().setRepositoryPerson(attr, person);
+		}
+	}
+
+	private TaskAttribute createAttribute(TaskData data,
+			IssueAttribute attribute, List<Label> values) {
+		TaskAttribute attr = createAttribute(data, attribute);
+		if (values != null) {
+			List<String> labels = new LinkedList<String>();
+			for (Label label : values) {
+				labels.add(label.getName());
+			}
+			data.getAttributeMapper().setValues(attr, labels);
+		}
+		return attr;
+	}
+
+	@Override
+	public boolean initializeTaskData(TaskRepository repository, TaskData data,
+			ITaskMapping initializationData, IProgressMonitor monitor)
+			throws CoreException {
+
+		data.setVersion(DATA_VERSION);
+
+		for (IssueAttribute attr : IssueAttribute.values()) {
+			if (attr.isInitTask()) {
+				createAttribute(data, attr, (String) null);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Update labels for issue
+	 * 
+	 * @param user
+	 * @param repo
+	 * @param client
+	 * @param repository
+	 * @param data
+	 * @param oldAttributes
+	 * @throws IOException
+	 */
+	protected void updateLabels(String user, String repo, GitHubClient client,
+			TaskRepository repository, TaskData data,
+			Set<TaskAttribute> oldAttributes) throws IOException {
+		// Update labels if changed
+		TaskAttribute labelsAttribute = data.getRoot().getAttribute(
+				IssueAttribute.LABELS.getId());
+		if (oldAttributes.contains(labelsAttribute)) {
+			LabelService labelService = new LabelService(client);
+
+			if (!this.connector.hasCachedLabels(repository))
+				try {
+					this.connector.refreshLabels(repository);
+				} catch (CoreException ignore) {
+					// Ignore
+				}
+			List<Label> currentLabels = this.connector.getLabels(repository);
+			List<Label> newLabels = new LinkedList<Label>();
+			List<Label> labels = new LinkedList<Label>();
+			for (String value : labelsAttribute.getValues()) {
+				Label label = new Label().setName(value);
+				if (!currentLabels.contains(label))
+					newLabels.add(label);
+				labels.add(label);
+			}
+			for (Label label : newLabels)
+				try {
+					labelService.createLabel(user, repo, label);
+				} catch (IOException e) {
+					// TODO detect failure and handle label already created
+				}
+
+			labelService.setLabels(user, repo, data.getTaskId(), labels);
+
+			if (!newLabels.isEmpty())
+				try {
+					this.connector.refreshLabels(repository);
+				} catch (CoreException ignore) {
+					// Ignore
+				}
+
+		}
+	}
+
+	@Override
+	public RepositoryResponse postTaskData(TaskRepository repository,
+			TaskData taskData, Set<TaskAttribute> oldAttributes,
+			IProgressMonitor monitor) throws CoreException {
+		String taskId = taskData.getTaskId();
+		Issue issue = createIssue(taskData);
+		Repository repo = GitHub.getRepository(repository.getRepositoryUrl());
+		try {
+			GitHubClient client = IssueConnector
+					.createClient(repository);
+			IssueService service = new IssueService(client);
+			if (taskData.isNew()) {
+				issue.setState(IssueService.STATE_OPEN);
+				issue = service.createIssue(repo.getOwner(), repo.getName(),
+						issue);
+				taskId = Integer.toString(issue.getNumber());
+			} else {
+
+				// Handle new comment
+				String comment = getAttributeValue(taskData,
+						IssueAttribute.COMMENT_NEW);
+				if (comment != null && comment.length() > 0)
+					service.createComment(repo.getOwner(), repo.getName(),
+							taskId, comment);
+
+				updateLabels(repo.getOwner(), repo.getName(), client,
+						repository, taskData, oldAttributes);
+
+				// Handle state change
+				TaskAttribute operationAttribute = taskData.getRoot()
+						.getAttribute(TaskAttribute.OPERATION);
+				if (operationAttribute != null) {
+					IssueOperation operation = IssueOperation
+							.fromId(operationAttribute.getValue());
+					if (operation != IssueOperation.LEAVE)
+						switch (operation) {
+						case REOPEN:
+							issue.setState(IssueService.STATE_OPEN);
+							break;
+						case CLOSE:
+							issue.setState(IssueService.STATE_CLOSED);
+							break;
+						default:
+							break;
+						}
+				}
+
+				service.editIssue(repo.getOwner(), repo.getName(), issue);
+			}
+			return new RepositoryResponse(
+					taskData.isNew() ? ResponseKind.TASK_CREATED
+							: ResponseKind.TASK_UPDATED, taskId);
+		} catch (RequestException e) {
+			throw new CoreException(
+					GitHub.createErrorStatus(new GitHubException(e)));
+		} catch (IOException e) {
+			throw new CoreException(GitHub.createErrorStatus(e));
+		}
+
+	}
+}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/Messages.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/Messages.java
new file mode 100644
index 00000000..6b97a831
--- /dev/null
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/Messages.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ *  Copyright (c) 2011 GitHub Inc.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *    Kevin Sawicki (GitHub Inc.) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.core.issue;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * NLS for Mylyn GitHub Core
+ */
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.github.core.issue.messages"; //$NON-NLS-1$
+
+	/** */
+	public static String IssueConnector_LabelConnector;
+
+	/** */
+	public static String IssueConector_TaskQuerying;
+
+	/** */
+	public static String IssueConnector_TaskUpdatingLabels;
+
+	/** */
+	public static String IssueConnector_TaskUpdatingMilestones;
+
+	/** */
+	public static String IssueAttribute_LabekSummary;
+
+	/** */
+	public static String IssueAttribute_LabelAssignee;
+
+	/** */
+	public static String IssueAttribute_LabelAssigneeGravatar;
+
+	/** */
+	public static String IssueAttribute_LabelClosed;
+
+	/** */
+	public static String IssueAttribute_LabelComment;
+
+	/** */
+	public static String IssueAttribute_LabelCreated;
+
+	/** */
+	public static String IssueAttribute_LabelDescription;
+
+	/** */
+	public static String IssueAttribute_LabelKey;
+
+	/** */
+	public static String IssueAttribute_LabelLabels;
+
+	/** */
+	public static String IssueAttribute_LabelMilestone;
+
+	/** */
+	public static String IssueAttribute_LabelModified;
+
+	/** */
+	public static String IssueAttribute_LabelReporter;
+
+	/** */
+	public static String IssueAttribute_LabelReporterGravatar;
+
+	/** */
+	public static String IssueAttribute_LabelStatus;
+
+	/** */
+	public static String IssueAttribute_MilestoneNone;
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/messages.properties b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/messages.properties
new file mode 100644
index 00000000..b64e1b8a
--- /dev/null
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/messages.properties
@@ -0,0 +1,19 @@
+IssueConnector_LabelConnector=GitHub Issues
+IssueConector_TaskQuerying=Querying repository...
+IssueConnector_TaskUpdatingLabels=Updating labels
+IssueConnector_TaskUpdatingMilestones=Updating milestones
+IssueAttribute_LabekSummary=Summary
+IssueAttribute_LabelAssignee=Assignee:
+IssueAttribute_LabelAssigneeGravatar=Assignee
+IssueAttribute_LabelClosed=Closed:
+IssueAttribute_LabelComment=Comment:
+IssueAttribute_LabelCreated=Created:
+IssueAttribute_LabelDescription=Description
+IssueAttribute_LabelKey=Key
+IssueAttribute_LabelLabels=Labels:
+IssueAttribute_LabelMilestone=Milestone:
+IssueAttribute_LabelModified=Modified:
+IssueAttribute_LabelReporter=Reporter:
+IssueAttribute_LabelReporterGravatar=Reporter
+IssueAttribute_LabelStatus=Status:
+IssueAttribute_MilestoneNone=None
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/messages.properties b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/messages.properties
new file mode 100644
index 00000000..52d8a86a
--- /dev/null
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/messages.properties
@@ -0,0 +1,4 @@
+FieldError_InvalidField=Invalid value for field {1}
+FieldError_InvalidFieldWithValue=Invalid value of {0} for field {1}
+FieldError_MissingField=Missing required field {0}
+FieldError_ResourceError=Error with field {0} in {1} resource
diff --git a/org.eclipse.mylyn.github.tests/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositoryConnectorUIHeadlessTest.java b/org.eclipse.mylyn.github.tests/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositoryConnectorUIHeadlessTest.java
index a42a5ce3..3c25a8d3 100644
--- a/org.eclipse.mylyn.github.tests/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositoryConnectorUIHeadlessTest.java
+++ b/org.eclipse.mylyn.github.tests/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositoryConnectorUIHeadlessTest.java
@@ -16,26 +16,27 @@ import static junit.framework.Assert.assertNotNull;
 
 import org.eclipse.jface.text.Region;
 import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.mylyn.github.internal.GitHub;
+import org.eclipse.mylyn.internal.github.core.GitHub;
+import org.eclipse.mylyn.internal.github.ui.issue.IssueConnectorUi;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.junit.Before;
 import org.junit.Test;
 
 /**
- * Headless test for {@link GitHubRepositoryConnectorUI}
+ * Headless test for {@link IssueConnectorUi}
  * 
  * @author Christian Trutz <christian.trutz@gmail.com>
  */
 @SuppressWarnings("restriction")
 public class GitHubRepositoryConnectorUIHeadlessTest {
 
-	private GitHubRepositoryConnectorUI connectorUI;
+	private IssueConnectorUi connectorUI;
 
 	private TaskRepository repository;
 
 	@Before
 	public void before() {
-		connectorUI = new GitHubRepositoryConnectorUI();
+		connectorUI = new IssueConnectorUi();
 		repository = new TaskRepository(GitHub.CONNECTOR_KIND,
 				GitHub.createGitHubUrl("foo", "bar"));
 	}
diff --git a/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF
index 0b56028f..276e3fb5 100644
--- a/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF
@@ -23,7 +23,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
  org.eclipse.egit.ui;bundle-version="0.12.0",
  org.eclipse.core.expressions;bundle-version="3.4.0",
  org.eclipse.egit.github.core;bundle-version="0.1.0"
-Export-Package: org.eclipse.mylyn.github.ui.internal;x-internal:=true
+Export-Package: org.eclipse.mylyn.github.ui.internal;x-internal:=true,
+ org.eclipse.mylyn.internal.github.ui.gist;x-internal:=true,
+ org.eclipse.mylyn.internal.github.ui.issue;x-internal:=true
 Bundle-ActivationPolicy: lazy
 Import-Package: org.apache.http;version="4.1.0",
  org.eclipse.egit.ui.internal;version="0.12.0"
diff --git a/org.eclipse.mylyn.github.ui/plugin.xml b/org.eclipse.mylyn.github.ui/plugin.xml
index 5c02cacc..076b3a20 100644
--- a/org.eclipse.mylyn.github.ui/plugin.xml
+++ b/org.eclipse.mylyn.github.ui/plugin.xml
@@ -4,13 +4,13 @@
    <extension
          point="org.eclipse.mylyn.tasks.ui.repositories">
       <connectorCore
-            class="org.eclipse.mylyn.github.internal.GitHubRepositoryConnector"
+            class="org.eclipse.mylyn.internal.github.core.issue.IssueConnector"
             id="org.eclipse.mylyn.github.ui.internal.GitHubRepositoryConnector"
             name="%org.eclipse.mylyn.github.ui.internal.GitHubRepositoryConnector">
       </connectorCore>
       <connectorUi
             brandingIcon="icons/obj16/github.png"
-            class="org.eclipse.mylyn.github.ui.internal.GitHubRepositoryConnectorUI"
+            class="org.eclipse.mylyn.internal.github.ui.issue.IssueConnectorUi"
             id="org.eclipse.mylyn.github.ui.internal.GitHubRepositoryConnectorUI"
             name="%org.eclipse.mylyn.github.ui.internal.GitHubRepositoryConnectorUI"
             overlayIcon="icons/obj16/github_8x8.png">
@@ -19,7 +19,7 @@
    <extension
          point="org.eclipse.mylyn.tasks.ui.editors">
       <pageFactory
-            class="org.eclipse.mylyn.github.ui.internal.GitHubTaskEditorPageFactory"
+            class="org.eclipse.mylyn.internal.github.ui.issue.IssueTaskEditorPageFactory"
             id="org.eclipse.mylyn.github.ui.internal.GitHubTaskEditorPageFactory">
       </pageFactory>
       <pageFactory
@@ -78,7 +78,7 @@
    <extension
          point="org.eclipse.ui.handlers">
       <handler
-            class="org.eclipse.mylyn.github.ui.internal.CreateGistHandler"
+            class="org.eclipse.mylyn.internal.github.ui.gist.CreateGistHandler"
             commandId="org.eclipse.mylyn.github.ui.command.createGist">
       </handler>
       <handler
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/CreateGistHandler.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/CreateGistHandler.java
deleted file mode 100644
index e6b1df26..00000000
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/CreateGistHandler.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
- *******************************************************************************/
-package org.eclipse.mylyn.github.ui.internal;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.Set;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.egit.github.core.client.GitHubClient;
-import org.eclipse.egit.github.core.service.GistService;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
-import org.eclipse.mylyn.commons.net.AuthenticationType;
-import org.eclipse.mylyn.internal.github.core.gist.GistConnector;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-public class CreateGistHandler extends AbstractHandler {
-
-	/**
-	 * @see org.eclipse.core.commands.AbstractHandler#isEnabled()
-	 */
-	public boolean isEnabled() {
-		return !TasksUi.getRepositoryManager()
-				.getRepositories(GistConnector.KIND).isEmpty();
-	}
-
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		IEditorPart editor = HandlerUtil.getActiveEditor(event);
-		ISelection selection = HandlerUtil.getCurrentSelection(event);
-		if(selection != null) {
-			if(selection instanceof ITextSelection) {
-				ITextSelection text = (ITextSelection) selection;
-				IEditorInput input = editor.getEditorInput();
-				if(input instanceof IFileEditorInput) {
-					// only use the first repository, in the future provide a selection if multiple exist
-					IFileEditorInput fileInput = (IFileEditorInput) input;
-					IFile file = fileInput.getFile();
-					createGistJob(file.getName(), file.getFileExtension(), text.getText());
-				}
-			} else
-			if(selection instanceof IStructuredSelection) {
-				IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-				Object obj = structuredSelection.getFirstElement();
-				if(obj instanceof IFile) {
-					IFile file = (IFile) obj;
-					createGistJob(file);
-				}
-			}
-		}
-		return null;
-	}
-
-	private void createGistJob(String name, String extension, String contents) {
-		Set<TaskRepository> repositories = TasksUi.getRepositoryManager()
-				.getRepositories(GistConnector.KIND);
-
-		TaskRepository repository = repositories.iterator().next();
-		GitHubClient client = new GitHubClient();
-		AuthenticationCredentials credentials = repository
-				.getCredentials(AuthenticationType.REPOSITORY);
-		String userName = null;
-		if (credentials != null) {
-			userName = credentials.getUserName();
-			client.setCredentials(userName, credentials.getPassword());
-		}
-		GistService service = new GistService(client);
-		CreateGistJob job = new CreateGistJob("Creating Gist", name, contents,
-				service, userName);
-		job.setSystem(true);
-		job.schedule();
-	}
-
-	private void createGistJob(IFile file) {
-		BufferedReader br = null;
-		try {
-			br = new BufferedReader(new InputStreamReader(file.getContents()));
-			String line;
-			StringBuilder result = new StringBuilder();
-			while ((line = br.readLine()) != null)
-				result.append(line).append('\n');
-
-			String contents = result.toString();
-			createGistJob(file.getName(), file.getFileExtension(), contents);
-		} catch (CoreException e) {
-			GitHubUi.logError(e);
-		} catch (IOException e) {
-			GitHubUi.logError(e);
-		} finally {
-			if (br != null)
-				try {
-					br.close();
-				} catch (IOException e) {
-					GitHubUi.logError(e);
-				}
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/CreateGistJob.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/CreateGistJob.java
deleted file mode 100644
index 4797d0bc..00000000
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/CreateGistJob.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
- *******************************************************************************/
-package org.eclipse.mylyn.github.ui.internal;
-
-import java.io.IOException;
-import java.util.Collections;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.egit.github.core.Gist;
-import org.eclipse.egit.github.core.GistFile;
-import org.eclipse.egit.github.core.User;
-import org.eclipse.egit.github.core.service.GistService;
-import org.eclipse.ui.PlatformUI;
-
-public class CreateGistJob extends Job {
-
-	private String title;
-	private String content;
-	private GistService service;
-	private String user;
-
-	public CreateGistJob(String name, String title, String content,
-			GistService service, String user) {
-		super(name);
-		this.title = title;
-		this.content = content;
-		this.service = service;
-		this.user = user;
-	}
-
-	@Override
-	protected IStatus run(IProgressMonitor monitor) {
-		try {
-			Gist gist = new Gist().setPublic(true);
-			if (user != null)
-				gist.setUser(new User().setLogin(user));
-			gist.setDescription(title);
-			GistFile file = new GistFile().setContent(content);
-			gist.setFiles(Collections.singletonMap(title, file));
-			final Gist created = service.createGist(gist);
-			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-				@SuppressWarnings("restriction")
-				public void run() {
-					GistNotificationPopup popup = new GistNotificationPopup(
-							PlatformUI.getWorkbench().getDisplay(), created, title);
-					popup.create();
-					popup.open();
-				}
-			});
-		} catch (IOException e) {
-			GitHubUi.logError(e);
-		}
-		return Status.OK_STATUS;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GistNotificationPopup.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GistNotificationPopup.java
deleted file mode 100644
index deefcf7a..00000000
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GistNotificationPopup.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
- *******************************************************************************/
-package org.eclipse.mylyn.github.ui.internal;
-
-import java.util.Set;
-
-import org.eclipse.egit.github.core.Gist;
-import org.eclipse.mylyn.internal.github.core.gist.GistConnector;
-import org.eclipse.mylyn.internal.provisional.commons.ui.AbstractNotificationPopup;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
-import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-
-@SuppressWarnings("restriction")
-public class GistNotificationPopup extends AbstractNotificationPopup {
-
-	private Gist gist;
-
-	private String title;
-
-	public GistNotificationPopup(Display display, Gist gist, String title) {
-		super(display);
-		this.gist = gist;
-		this.title = title;
-	}
-
-	@Override
-	protected void createContentArea(Composite composite) {
-		composite.setLayout(new GridLayout(1, true));
-		Label label = new Label(composite, SWT.NONE);
-		label.setText("Title: " + title);
-		Link link = new Link(composite, SWT.WRAP);
-		link.setText("Created Gist: <a>" + gist.getId() + "</a>");
-		link.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		link.setBackground(composite.getBackground());
-		link.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				Set<TaskRepository> repositories = TasksUi
-						.getRepositoryManager().getRepositories(
-								GistConnector.KIND);
-				if (!repositories.isEmpty())
-					TasksUiUtil.openTask(repositories.iterator().next(), gist.getId());
-			}
-		});
-	}
-
-	@Override
-	protected String getPopupShellTitle() {
-		return "GitHub Notification";
-	}
-
-	@Override
-	protected Image getPopupShellImage(int maximumHeight) {
-		return GitHubImages.get(GitHubImages.GITHUB_LOGO_OBJ);
-	}
-
-}
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositoryConnectorUI.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositoryConnectorUI.java
deleted file mode 100644
index c82ffdee..00000000
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositoryConnectorUI.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Green <david.green@tasktop.com> - initial contribution
- *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
- *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
- *******************************************************************************/
-package org.eclipse.mylyn.github.ui.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.egit.github.core.Repository;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.jface.text.hyperlink.URLHyperlink;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.mylyn.github.internal.GitHub;
-import org.eclipse.mylyn.github.internal.GitHubRepositoryConnector;
-import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.ITaskMapping;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
-import org.eclipse.mylyn.tasks.ui.TaskHyperlink;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
-import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage;
-import org.eclipse.mylyn.tasks.ui.wizards.ITaskRepositoryPage;
-import org.eclipse.mylyn.tasks.ui.wizards.ITaskSearchPage;
-import org.eclipse.mylyn.tasks.ui.wizards.NewTaskWizard;
-import org.eclipse.mylyn.tasks.ui.wizards.RepositoryQueryWizard;
-
-/**
- * GitHub connector specific UI extensions.
- */
-public class GitHubRepositoryConnectorUI extends AbstractRepositoryConnectorUi {
-
-	private final Pattern issuePattern = Pattern.compile("(?:([a-zA-Z0-9_\\.-]+)(?:/([a-zA-Z0-9_\\.-]+))?)?\\#(\\d+)");
-
-	/**
-	 * Get core repository connector
-	 * 
-	 * @return connector
-	 */
-	public static GitHubRepositoryConnector getCoreConnector() {
-		return (GitHubRepositoryConnector) TasksUi
-				.getRepositoryConnector(GitHub.CONNECTOR_KIND);
-	}
-
-	/**
-	 * 
-	 * 
-	 * @return the unique type of the repository: "github"
-	 */
-	@Override
-	public String getConnectorKind() {
-		return GitHub.CONNECTOR_KIND;
-	}
-
-	/**
-	 * 
-	 * 
-	 * @return {@link AbstractRepositorySettingsPage} with GitHub specific
-	 *         parameter like user name, password, ...
-	 */
-	@Override
-	public ITaskRepositoryPage getSettingsPage(
-			final TaskRepository taskRepository) {
-		return new GitHubRepositorySettingsPage(taskRepository);
-	}
-
-	/**
-	 * 
-	 * 
-	 * @return {@link NewTaskWizard} with GitHub specific tab
-	 */
-	@Override
-	public IWizard getNewTaskWizard(final TaskRepository taskRepository,
-			final ITaskMapping taskSelection) {
-		return new NewTaskWizard(taskRepository, taskSelection);
-	}
-
-	/**
-	 * This {@link AbstractRepositoryConnectorUi} has search page.
-	 * 
-	 * @return {@code true}
-	 */
-	@Override
-	public boolean hasSearchPage() {
-		return true;
-	}
-
-	/**
-	 * Returns {@link IWizard} used in Mylyn for creating new queries. This
-	 * {@link IWizard} has a wizard page for creating GitHub specific task
-	 * queries.
-	 * 
-	 * @return {@link RepositoryQueryWizard} with GitHub specific query page
-	 */
-	@Override
-	public IWizard getQueryWizard(final TaskRepository taskRepository,
-			final IRepositoryQuery queryToEdit) {
-		RepositoryQueryWizard wizard = new RepositoryQueryWizard(taskRepository);
-		GitHubRepositoryQueryPage queryPage = new GitHubRepositoryQueryPage(
-				taskRepository, queryToEdit);
-		wizard.addPage(queryPage);
-		return wizard;
-	}
-	
-	
-	public IHyperlink[] findHyperlinks(TaskRepository repository, String text, int index, int textOffset) {
-		List<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
-		
-		Matcher matcher = issuePattern.matcher(text);
-		while (matcher.find()) {
-			if (index == -1 || (index >= matcher.start() && index <= matcher.end())) {
-				String user = matcher.group(1);
-				String project = matcher.group(2);
-				String taskId = matcher.group(3);
-				
-				if (project == null && user != null) {
-					// same project name, different user
-					String url = repository.getUrl();
-					Repository repo = GitHub.getRepository(url);
-					if (repo != null)
-						project = repo.getName();
-				}
-				
-				TaskRepository taskRepository = null;
-				if (user == null && project == null) { 
-					taskRepository = repository;
-				} else if (user != null && project != null) {
-					String repositoryUrl = GitHub.createGitHubUrl(user,project);
-					taskRepository = TasksUi.getRepositoryManager().getRepository(GitHub.CONNECTOR_KIND, repositoryUrl);
-					if (taskRepository == null) {
-						repositoryUrl = GitHub.createGitHubUrlAlternate(user,project);
-						taskRepository = TasksUi.getRepositoryManager().getRepository(GitHub.CONNECTOR_KIND, repositoryUrl);	
-					}
-				}
-				if (taskRepository != null) {
-					Region region = createRegion(textOffset, matcher);
-					hyperlinks.add(new TaskHyperlink(region, repository, taskId));
-				} else if (user != null && project != null) {
-					Region region = createRegion(textOffset, matcher);
-					String url = GitHub.createGitHubUrl(user, project)+"/issues/issue/"+taskId;
-					hyperlinks.add(new URLHyperlink(region, url));
-				}
-			}
-		}
-		return hyperlinks.toArray(new IHyperlink[hyperlinks.size()]);
-	}
-
-	private Region createRegion(int textOffset, Matcher matcher) {
-		return new Region(matcher.start()+textOffset,matcher.end()-matcher.start());
-	}
-
-	/**
-	 * @see org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi#getSearchPage(org.eclipse.mylyn.tasks.core.TaskRepository,
-	 *      org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public ITaskSearchPage getSearchPage(TaskRepository repository,
-			IStructuredSelection selection) {
-		return new GitHubRepositoryQueryPage(repository, null);
-	}
-
-}
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositoryQueryPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositoryQueryPage.java
deleted file mode 100644
index ba421dfa..00000000
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositoryQueryPage.java
+++ /dev/null
@@ -1,436 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Green <david.green@tasktop.com> - initial contribution
- *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
- *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
- *******************************************************************************/
-package org.eclipse.mylyn.github.ui.internal;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.egit.github.core.Milestone;
-import org.eclipse.egit.github.core.service.IssueService;
-import org.eclipse.egit.github.core.util.LabelComparator;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.layout.GridLayoutFactory;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.mylyn.commons.net.Policy;
-import org.eclipse.mylyn.github.internal.GitHubRepositoryConnector;
-import org.eclipse.mylyn.github.internal.QueryUtils;
-import org.eclipse.mylyn.internal.provisional.commons.ui.CommonUiUtil;
-import org.eclipse.mylyn.internal.provisional.commons.ui.ICoreRunnable;
-import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.ui.TasksUiImages;
-import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * GitHub issue repository query page class.
- */
-public class GitHubRepositoryQueryPage extends AbstractRepositoryQueryPage {
-
-	private Button openButton;
-	private Button closedButton;
-	private Text titleText;
-	private Text assigneeText;
-	private Text mentionText;
-	private Combo milestoneCombo;
-	private CheckboxTableViewer labelsViewer;
-	private List<Milestone> milestones;
-
-	private SelectionListener completeListener = new SelectionAdapter() {
-
-		public void widgetSelected(SelectionEvent e) {
-			setPageComplete(isPageComplete());
-		}
-
-	};
-
-	/**
-	 * @param pageName
-	 * @param taskRepository
-	 * @param query
-	 */
-	public GitHubRepositoryQueryPage(String pageName,
-			TaskRepository taskRepository, IRepositoryQuery query) {
-		super(pageName, taskRepository, query);
-		setDescription(Messages.GitHubRepositoryQueryPage_Description);
-		setPageComplete(false);
-	}
-
-	/**
-	 * @param taskRepository
-	 * @param query
-	 */
-	public GitHubRepositoryQueryPage(TaskRepository taskRepository,
-			IRepositoryQuery query) {
-		this("issueQueryPage", taskRepository, query); //$NON-NLS-1$
-	}
-
-	private void createLabelsArea(Composite parent) {
-		Group labelsArea = new Group(parent, SWT.NONE);
-		labelsArea.setText(Messages.GitHubRepositoryQueryPage_LabelsLabel);
-		GridDataFactory.fillDefaults().grab(true, true).applyTo(labelsArea);
-		GridLayoutFactory.swtDefaults().applyTo(labelsArea);
-
-		labelsViewer = CheckboxTableViewer.newCheckList(labelsArea, SWT.BORDER
-				| SWT.V_SCROLL | SWT.H_SCROLL);
-		GridDataFactory.fillDefaults().grab(true, true).hint(100, 80)
-				.applyTo(labelsViewer.getControl());
-		labelsViewer.setContentProvider(ArrayContentProvider.getInstance());
-		labelsViewer.setLabelProvider(new LabelProvider() {
-
-			public Image getImage(Object element) {
-				return GitHubImages.get(GitHubImages.GITHUB_ISSUE_LABEL_OBJ);
-			}
-
-		});
-		labelsViewer
-				.addSelectionChangedListener(new ISelectionChangedListener() {
-
-					public void selectionChanged(SelectionChangedEvent event) {
-						setPageComplete(isPageComplete());
-					}
-				});
-	}
-
-	private void createOptionsArea(Composite parent) {
-		Composite optionsArea = new Composite(parent, SWT.NONE);
-		GridLayoutFactory.fillDefaults().numColumns(2).applyTo(optionsArea);
-		GridDataFactory.fillDefaults().grab(true, true).applyTo(optionsArea);
-
-		Composite statusArea = new Composite(optionsArea, SWT.NONE);
-		GridLayoutFactory.fillDefaults().numColumns(4).equalWidth(false)
-				.applyTo(statusArea);
-		GridDataFactory.fillDefaults().grab(true, false).span(2, 1)
-				.applyTo(statusArea);
-
-		new Label(statusArea, SWT.NONE)
-				.setText(Messages.GitHubRepositoryQueryPage_StatusLabel);
-
-		openButton = new Button(statusArea, SWT.CHECK);
-		openButton.setSelection(true);
-		openButton.setText(Messages.GitHubRepositoryQueryPage_StatusOpen);
-		openButton.addSelectionListener(this.completeListener);
-
-		closedButton = new Button(statusArea, SWT.CHECK);
-		closedButton.setSelection(true);
-		closedButton.setText(Messages.GitHubRepositoryQueryPage_StatusClosed);
-		closedButton.addSelectionListener(this.completeListener);
-
-		ToolBar toolbar = new ToolBar(statusArea, SWT.FLAT);
-		ToolItem updateItem = new ToolItem(toolbar, SWT.PUSH);
-		final Image updateImage = TasksUiImages.REPOSITORY_UPDATE_CONFIGURATION
-				.createImage();
-		toolbar.addDisposeListener(new DisposeListener() {
-
-			public void widgetDisposed(DisposeEvent e) {
-				updateImage.dispose();
-			}
-		});
-		updateItem.setImage(updateImage);
-		updateItem
-				.setToolTipText(Messages.GitHubRepositoryQueryPage_TooltipUpdateRepository);
-		GridDataFactory.fillDefaults().align(SWT.END, SWT.FILL)
-				.grab(true, false).applyTo(toolbar);
-		updateItem.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent e) {
-				refreshRepository();
-			}
-
-		});
-
-		Label milestonesLabel = new Label(optionsArea, SWT.NONE);
-		milestonesLabel
-				.setText(Messages.GitHubRepositoryQueryPage_MilestoneLabel);
-
-		milestoneCombo = new Combo(optionsArea, SWT.DROP_DOWN | SWT.READ_ONLY);
-		GridDataFactory.fillDefaults().grab(true, false)
-				.applyTo(milestoneCombo);
-
-		Label assigneeLabel = new Label(optionsArea, SWT.NONE);
-		assigneeLabel.setText(Messages.GitHubRepositoryQueryPage_AssigneeLabel);
-
-		assigneeText = new Text(optionsArea, SWT.BORDER | SWT.SINGLE);
-		GridDataFactory.fillDefaults().grab(true, false).applyTo(assigneeText);
-
-		Label mentionLabel = new Label(optionsArea, SWT.NONE);
-		mentionLabel.setText(Messages.GitHubRepositoryQueryPage_MentionsLabel);
-
-		mentionText = new Text(optionsArea, SWT.BORDER | SWT.SINGLE);
-		GridDataFactory.fillDefaults().grab(true, false).applyTo(mentionText);
-
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite displayArea = new Composite(parent, SWT.NONE);
-		GridLayoutFactory.fillDefaults().numColumns(2).equalWidth(true)
-				.applyTo(displayArea);
-		GridDataFactory.fillDefaults().grab(true, true).applyTo(displayArea);
-
-		if (!inSearchContainer()) {
-			Composite titleArea = new Composite(displayArea, SWT.NONE);
-			GridLayoutFactory.fillDefaults().numColumns(2).applyTo(titleArea);
-			GridDataFactory.fillDefaults().grab(true, false).span(2, 1)
-					.applyTo(titleArea);
-
-			new Label(titleArea, SWT.NONE)
-					.setText(Messages.GitHubRepositoryQueryPage_TitleLabel);
-			titleText = new Text(titleArea, SWT.SINGLE | SWT.BORDER);
-			GridDataFactory.fillDefaults().grab(true, false).applyTo(titleText);
-			titleText.addModifyListener(new ModifyListener() {
-
-				public void modifyText(ModifyEvent e) {
-					setPageComplete(isPageComplete());
-				}
-			});
-		}
-
-		createOptionsArea(displayArea);
-
-		createLabelsArea(displayArea);
-
-		loadRepository();
-
-		initialize();
-		setControl(displayArea);
-	}
-
-	private void initialize() {
-		IRepositoryQuery query = getQuery();
-		if (query == null)
-			return;
-
-		String milestoneNumber = query
-				.getAttribute(IssueService.FILTER_MILESTONE);
-		if (milestoneNumber != null && this.milestones != null) {
-			int index = 0;
-			for (Milestone milestone : this.milestones) {
-				index++;
-				if (milestoneNumber.equals(Integer.toString(milestone
-						.getNumber()))) {
-					this.milestoneCombo.select(index);
-					break;
-				}
-			}
-		}
-
-		titleText.setText(query.getSummary());
-		labelsViewer.setCheckedElements(QueryUtils.getAttributes(
-				IssueService.FILTER_LABELS, query).toArray());
-		List<String> status = QueryUtils.getAttributes(
-				IssueService.FILTER_STATE, query);
-		closedButton.setSelection(status.contains(IssueService.STATE_CLOSED));
-		openButton.setSelection(status.contains(IssueService.STATE_OPEN));
-
-		String assignee = query.getAttribute(IssueService.FILTER_ASSIGNEE);
-		if (assignee != null)
-			assigneeText.setText(assignee);
-
-		String mentioning = query.getAttribute(IssueService.FILTER_MENTIONED);
-		if (mentioning != null)
-			mentionText.setText(mentioning);
-	}
-
-	private boolean updateLabels() {
-		if (this.labelsViewer.getControl().isDisposed())
-			return false;
-
-		GitHubRepositoryConnector connector = GitHubRepositoryConnectorUI
-				.getCoreConnector();
-		TaskRepository repository = getTaskRepository();
-		boolean hasLabels = connector.hasCachedLabels(repository);
-		if (hasLabels) {
-			List<org.eclipse.egit.github.core.Label> labels = connector
-					.getLabels(repository);
-			Collections.sort(labels, new LabelComparator());
-			List<String> labelNames = new ArrayList<String>(labels.size());
-			for (org.eclipse.egit.github.core.Label label : labels)
-				labelNames.add(label.getName());
-			this.labelsViewer.setInput(labelNames);
-		}
-		return hasLabels;
-	}
-
-	private boolean updateMilestones() {
-		if (this.milestoneCombo.isDisposed())
-			return false;
-
-		GitHubRepositoryConnector connector = GitHubRepositoryConnectorUI
-				.getCoreConnector();
-		TaskRepository repository = getTaskRepository();
-		boolean hasMilestones = connector.hasCachedMilestones(repository);
-		if (hasMilestones) {
-			this.milestones = connector.getMilestones(repository);
-			this.milestoneCombo.removeAll();
-			this.milestoneCombo
-					.add(Messages.GitHubRepositoryQueryPage_MilestoneNone);
-			Collections.sort(this.milestones, new Comparator<Milestone>() {
-
-				public int compare(Milestone m1, Milestone m2) {
-					return m1.getTitle().compareToIgnoreCase(m2.getTitle());
-				}
-			});
-			for (Milestone milestone : milestones)
-				this.milestoneCombo.add(milestone.getTitle());
-
-			this.milestoneCombo.select(0);
-		}
-		return hasMilestones;
-	}
-
-	private void refreshRepository() {
-		try {
-			ICoreRunnable runnable = new ICoreRunnable() {
-
-				public void run(IProgressMonitor monitor) throws CoreException {
-					Policy.monitorFor(monitor);
-					monitor.beginTask("", 2); //$NON-NLS-1$
-					GitHubRepositoryConnector connector = GitHubRepositoryConnectorUI
-							.getCoreConnector();
-					TaskRepository repository = getTaskRepository();
-
-					monitor.setTaskName(Messages.GitHubRepositoryQueryPage_TaskLoadingLabels);
-					connector.refreshLabels(repository);
-					monitor.worked(1);
-
-					monitor.setTaskName(Messages.GitHubRepositoryQueryPage_TaskLoadingMilestones);
-					connector.refreshMilestones(repository);
-					monitor.done();
-
-					PlatformUI.getWorkbench().getDisplay()
-							.asyncExec(new Runnable() {
-
-								public void run() {
-									updateLabels();
-									updateMilestones();
-									initialize();
-								}
-							});
-				}
-			};
-			IRunnableContext context = getContainer();
-			if (context == null)
-				if (inSearchContainer())
-					context = getSearchContainer().getRunnableContext();
-				else
-					context = PlatformUI.getWorkbench().getProgressService();
-			CommonUiUtil.run(context, runnable);
-		} catch (CoreException e) {
-			IStatus status = e.getStatus();
-			ErrorDialog.openError(getShell(),
-					Messages.GitHubRepositoryQueryPage_ErrorLoading,
-					e.getLocalizedMessage(), status);
-		}
-	}
-
-	private void loadRepository() {
-		boolean labelsLoaded = updateLabels();
-		boolean milestonesLoaded = updateMilestones();
-		if (!labelsLoaded || !milestonesLoaded)
-			refreshRepository();
-	}
-
-	/**
-	 * @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage#isPageComplete()
-	 */
-	public boolean isPageComplete() {
-		boolean complete = super.isPageComplete();
-		if (complete) {
-			String message = null;
-			if (!openButton.getSelection() && !closedButton.getSelection())
-				message = Messages.GitHubRepositoryQueryPage_ErrorStatus;
-
-			setErrorMessage(message);
-			complete = message == null;
-		}
-		return complete;
-	}
-
-	/**
-	 * @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage#getQueryTitle()
-	 */
-	public String getQueryTitle() {
-		return this.titleText != null ? this.titleText.getText() : null;
-	}
-
-	/**
-	 * @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage#applyTo(org.eclipse.mylyn.tasks.core.IRepositoryQuery)
-	 */
-	public void applyTo(IRepositoryQuery query) {
-		query.setSummary(getQueryTitle());
-
-		List<String> statuses = new LinkedList<String>();
-		if (openButton.getSelection())
-			statuses.add(IssueService.STATE_OPEN);
-		if (closedButton.getSelection())
-			statuses.add(IssueService.STATE_CLOSED);
-		QueryUtils.setAttribute(IssueService.FILTER_STATE, statuses, query);
-
-		String assignee = this.assigneeText.getText().trim();
-		if (assignee.length() > 0)
-			query.setAttribute(IssueService.FILTER_ASSIGNEE, assignee);
-		else
-			query.setAttribute(IssueService.FILTER_ASSIGNEE, null);
-
-		String mentions = this.mentionText.getText().trim();
-		if (mentions.length() > 0)
-			query.setAttribute(IssueService.FILTER_MENTIONED, mentions);
-		else
-			query.setAttribute(IssueService.FILTER_MENTIONED, null);
-
-		int milestoneSelected = this.milestoneCombo.getSelectionIndex() - 1;
-		if (milestoneSelected >= 0)
-			query.setAttribute(IssueService.FILTER_MILESTONE, Integer
-					.toString(this.milestones.get(milestoneSelected)
-							.getNumber()));
-		else
-			query.setAttribute(IssueService.FILTER_MILESTONE, null);
-
-		List<String> labels = new LinkedList<String>();
-		for (Object label : labelsViewer.getCheckedElements())
-			labels.add(label.toString());
-		QueryUtils.setAttribute(IssueService.FILTER_LABELS, labels, query);
-	}
-}
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositorySettingsPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositorySettingsPage.java
deleted file mode 100644
index 84550f68..00000000
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositorySettingsPage.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Green <david.green@tasktop.com> - initial contribution
- *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
- *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
- *******************************************************************************/
-package org.eclipse.mylyn.github.ui.internal;
-
-import java.io.IOException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.egit.github.core.Repository;
-import org.eclipse.egit.github.core.client.GitHubClient;
-import org.eclipse.egit.github.core.service.IssueService;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
-import org.eclipse.mylyn.commons.net.AuthenticationType;
-import org.eclipse.mylyn.github.internal.GitHub;
-import org.eclipse.mylyn.internal.tasks.core.IRepositoryConstants;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * GitHub connector specific extensions.
- */
-public class GitHubRepositorySettingsPage extends
-		AbstractRepositorySettingsPage {
-
-	/**
-	 * URL
-	 */
-	public static final String URL = "http://github.com"; //$NON-NLS-1$
-
-	/**
-	 * DEFAULT_REPOSITORY
-	 */
-	public static final String DEFAULT_REPOSITORY = "/user/repository"; //$NON-NLS-1$
-
-	private boolean syncLabel = true;
-	private boolean editingUrl = false;
-
-	/**
-	 * Populate taskRepository with repository settings.
-	 * 
-	 * @param taskRepository
-	 *            - Object to populate
-	 */
-	public GitHubRepositorySettingsPage(final TaskRepository taskRepository) {
-		super(Messages.GitHubRepositorySettingsPage_Title,
-				Messages.GitHubRepositorySettingsPage_Description,
-				taskRepository);
-		this.setHttpAuth(false);
-		this.setNeedsAdvanced(false);
-		this.setNeedsAnonymousLogin(true);
-		this.setNeedsTimeZone(false);
-		this.setNeedsHttpAuth(false);
-	}
-
-	@Override
-	public String getConnectorKind() {
-		return GitHub.CONNECTOR_KIND;
-	}
-
-	/**
-	 * Sync server url combo with repository label editor base on default label
-	 * format
-	 */
-	protected void syncRepositoryLabel() {
-		if (syncLabel) {
-			String url = serverUrlCombo.getText();
-			Repository repo = GitHub.getRepository(url);
-			if (repo != null)
-				repositoryLabelEditor.setStringValue(repo.getOwner() + '/'
-						+ repo.getName());
-		}
-	}
-
-	@Override
-	protected void createAdditionalControls(Composite parent) {
-		// Set the URL now, because serverURL is definitely instantiated .
-		if (serverUrlCombo.getText().length() == 0) {
-			String fullUrlText = URL + DEFAULT_REPOSITORY;
-			serverUrlCombo.setText(fullUrlText);
-			serverUrlCombo.setFocus();
-			// select the user/project part of the URL so that the user can just
-			// start typing to replace the text.
-			serverUrlCombo.setSelection(new Point(URL.length() + 1, fullUrlText
-					.length()));
-
-			syncRepositoryLabel();
-
-			serverUrlCombo.addModifyListener(new ModifyListener() {
-
-				public void modifyText(ModifyEvent e) {
-					editingUrl = true;
-					try {
-						syncRepositoryLabel();
-					} finally {
-						editingUrl = false;
-					}
-				}
-			});
-
-			repositoryLabelEditor.getTextControl(compositeContainer)
-					.addModifyListener(new ModifyListener() {
-
-						public void modifyText(ModifyEvent e) {
-							if (!editingUrl)
-								syncLabel = false;
-						}
-					});
-		}
-
-		if (getRepository() == null)
-			setAnonymous(false);
-	}
-
-	@Override
-	protected Validator getValidator(final TaskRepository repository) {
-		Validator validator = new Validator() {
-			@Override
-			public void run(IProgressMonitor monitor) throws CoreException {
-				monitor.beginTask(
-						Messages.GitHubRepositorySettingsPage_TaskValidating,
-						100);
-				try {
-					monitor.subTask(Messages.GitHubRepositorySettingsPage_TaskContactingServer);
-					try {
-						AuthenticationCredentials auth = repository
-								.getCredentials(AuthenticationType.REPOSITORY);
-						GitHubClient client = new GitHubClient();
-						if (auth != null)
-							client.setCredentials(auth.getUserName(),
-									auth.getPassword());
-						IssueService service = new IssueService(client);
-						Repository repo = GitHub.getRepository(repository
-								.getRepositoryUrl());
-						monitor.worked(50);
-						service.getIssues(repo.getOwner(), repo.getName(), null);
-					} catch (IOException e) {
-						String message = MessageFormat
-								.format(Messages.GitHubRepositorySettingsPage_StatusError,
-										e.getLocalizedMessage());
-						setStatus(GitHubUi.createErrorStatus(message));
-						return;
-					} finally {
-						monitor.done();
-					}
-
-					setStatus(new Status(IStatus.OK, GitHubUi.BUNDLE_ID,
-							Messages.GitHubRepositorySettingsPage_StatusSuccess));
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-		return validator;
-	}
-
-	@Override
-	protected boolean isValidUrl(final String url) {
-		if (url.startsWith("http://") || url.startsWith("https://")) //$NON-NLS-1$ //$NON-NLS-2$
-			try {
-				new URL(url);
-				return GitHub.getRepository(url) != null;
-			} catch (IOException e) {
-				return false;
-			}
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage#applyTo(org.eclipse.mylyn.tasks.core.TaskRepository)
-	 */
-	public void applyTo(TaskRepository repository) {
-		repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY,
-				IRepositoryConstants.CATEGORY_BUGS);
-		super.applyTo(repository);
-	}
-
-	/**
-	 * @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage#canValidate()
-	 */
-	public boolean canValidate() {
-		return isPageComplete()
-				&& (getMessage() == null || getMessageType() != IMessageProvider.ERROR);
-	}
-
-}
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubTaskEditorPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubTaskEditorPage.java
deleted file mode 100644
index d9a686f2..00000000
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubTaskEditorPage.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Green <david.green@tasktop.com> - initial contribution
- *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
- *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
- *******************************************************************************/
-package org.eclipse.mylyn.github.ui.internal;
-
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.mylyn.github.internal.GitHub;
-import org.eclipse.mylyn.github.internal.GitHubTaskAttributes;
-import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPage;
-import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPart;
-import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
-import org.eclipse.mylyn.tasks.ui.editors.TaskEditorPartDescriptor;
-
-/**
- * Editor page for GitHub.
- */
-public class GitHubTaskEditorPage extends AbstractTaskEditorPage {
-
-	/**
-	 * Constructor for the GitHubTaskEditorPage
-	 * 
-	 * @param editor
-	 *            The task editor to create for GitHub
-	 */
-	public GitHubTaskEditorPage(final TaskEditor editor) {
-		super(editor, GitHub.CONNECTOR_KIND);
-		setNeedsPrivateSection(true);
-		setNeedsSubmitButton(true);
-	}
-
-	@Override
-	protected Set<TaskEditorPartDescriptor> createPartDescriptors() {
-		Set<TaskEditorPartDescriptor> partDescriptors = super
-				.createPartDescriptors();
-		Iterator<TaskEditorPartDescriptor> descriptorIt = partDescriptors
-				.iterator();
-		while (descriptorIt.hasNext()) {
-			TaskEditorPartDescriptor partDescriptor = descriptorIt.next();
-			String id = partDescriptor.getId();
-			if (id.equals(ID_PART_ATTRIBUTES) || id.equals(ID_PART_SUMMARY))
-				descriptorIt.remove();
-		}
-		partDescriptors.add(new TaskEditorPartDescriptor(ID_PART_SUMMARY) {
-
-			public AbstractTaskEditorPart createPart() {
-				return new IssueSummaryPart(
-						GitHubTaskAttributes.REPORTER_GRAVATAR.getId(),
-						GitHubTaskAttributes.ASSIGNEE_GRAVATAR.getId());
-			}
-		}.setPath(PATH_HEADER));
-		partDescriptors.add(new TaskEditorPartDescriptor(ID_PART_ATTRIBUTES) {
-
-			public AbstractTaskEditorPart createPart() {
-				return new IssueAttributePart();
-			}
-		}.setPath(PATH_ATTRIBUTES));
-		return partDescriptors;
-	}
-
-}
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubTaskEditorPageFactory.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubTaskEditorPageFactory.java
deleted file mode 100644
index fd1ced9b..00000000
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubTaskEditorPageFactory.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Green <david.green@tasktop.com> - initial contribution
- *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
- *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
- *******************************************************************************/
-package org.eclipse.mylyn.github.ui.internal;
-
-import org.eclipse.mylyn.github.internal.GitHub;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.ui.ITasksUiConstants;
-import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
-import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPageFactory;
-import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
-import org.eclipse.mylyn.tasks.ui.editors.TaskEditorInput;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.forms.editor.IFormPage;
-
-/**
- * Editor page factory for GitHub.
- */
-public class GitHubTaskEditorPageFactory extends AbstractTaskEditorPageFactory {
-
-	@Override
-	public boolean canCreatePageFor(TaskEditorInput input) {
-		ITask task = input.getTask();
-		return GitHub.CONNECTOR_KIND.equals(task.getConnectorKind())
-				|| TasksUiUtil.isOutgoingNewTask(task, GitHub.CONNECTOR_KIND);
-	}
-
-	@Override
-	public Image getPageImage() {
-		return GitHubImages.get(GitHubImages.GITHUB_LOGO_OBJ);
-	}
-
-	@Override
-	public String getPageText() {
-		return Messages.GitHubTaskEditorPageFactory_PageText;
-	}
-
-	@Override
-	public int getPriority() {
-		return PRIORITY_TASK;
-	}
-
-	@Override
-	public IFormPage createPage(TaskEditor parentEditor) {
-		return new GitHubTaskEditorPage(parentEditor);
-	}
-
-	@Override
-	public String[] getConflictingIds(TaskEditorInput input) {
-		return new String[] { ITasksUiConstants.ID_PAGE_PLANNING };
-	}
-
-}
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/ImportRepositoriesWizard.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/ImportRepositoriesWizard.java
index 660f43fd..4a81a496 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/ImportRepositoriesWizard.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/ImportRepositoriesWizard.java
@@ -16,7 +16,7 @@ import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
 import org.eclipse.mylyn.commons.net.AuthenticationType;
-import org.eclipse.mylyn.github.internal.GitHub;
+import org.eclipse.mylyn.internal.github.core.GitHub;
 import org.eclipse.mylyn.internal.github.core.gist.GistConnector;
 import org.eclipse.mylyn.internal.github.ui.gist.GistRepositorySettingsPage;
 import org.eclipse.mylyn.internal.github.ui.gist.Messages;
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/IssueAttributePart.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/IssueAttributePart.java
deleted file mode 100644
index 0dc27669..00000000
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/IssueAttributePart.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011 GitHub Inc.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *    Kevin Sawicki (GitHub Inc.) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.github.ui.internal;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.github.internal.GitHubTaskAttributes;
-import org.eclipse.mylyn.internal.provisional.commons.ui.CommonFormUtil;
-import org.eclipse.mylyn.internal.provisional.commons.ui.WorkbenchUtil;
-import org.eclipse.mylyn.internal.tasks.ui.editors.AbstractTaskEditorSection;
-import org.eclipse.mylyn.internal.tasks.ui.editors.EditorUtil;
-import org.eclipse.mylyn.internal.tasks.ui.editors.Messages;
-import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
-import org.eclipse.mylyn.internal.tasks.ui.views.UpdateRepositoryConfigurationAction;
-import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
-import org.eclipse.mylyn.tasks.core.data.TaskAttributeMetaData;
-import org.eclipse.mylyn.tasks.core.sync.TaskJob;
-import org.eclipse.mylyn.tasks.ui.TasksUiImages;
-import org.eclipse.mylyn.tasks.ui.editors.AbstractAttributeEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * GitHub issue task editor attribute part that display labels and milestone
- * attribute editors.
- */
-public class IssueAttributePart extends AbstractTaskEditorSection {
-
-	private List<AbstractAttributeEditor> attributeEditors;
-
-	private boolean hasIncoming;
-
-	private Composite attributesComposite;
-
-	public IssueAttributePart() {
-		setPartName(Messages.TaskEditorAttributePart_Attributes);
-	}
-
-	@Override
-	protected AbstractAttributeEditor createAttributeEditor(
-			TaskAttribute attribute) {
-		if (GitHubTaskAttributes.LABELS.getId().equals(attribute.getId())) {
-			return new IssueLabelAttributeEditor(getModel(), attribute);
-		} else if (GitHubTaskAttributes.MILESTONE.getId().equals(
-				attribute.getId())) {
-			return super.createAttributeEditor(attribute);
-		}
-		return null;
-	}
-
-	private void createAttributeControls(Composite attributesComposite,
-			FormToolkit toolkit, int columnCount) {
-		for (AbstractAttributeEditor attributeEditor : attributeEditors) {
-			if (attributeEditor.hasLabel())
-				attributeEditor
-						.createLabelControl(attributesComposite, toolkit);
-			attributeEditor.createControl(attributesComposite, toolkit);
-			Object data = attributeEditor.getControl().getLayoutData();
-			if (data == null) {
-				data = GridDataFactory.swtDefaults().create();
-				attributeEditor.getControl().setLayoutData(data);
-			}
-			if (data instanceof GridData)
-				((GridData) data).widthHint = 140;
-			getTaskEditorPage().getAttributeEditorToolkit().adapt(
-					attributeEditor);
-		}
-	}
-
-	@Override
-	public void createControl(Composite parent, final FormToolkit toolkit) {
-		initialize();
-		super.createControl(parent, toolkit);
-	}
-
-	@Override
-	protected String getInfoOverlayText() {
-		return null;
-	}
-
-	@Override
-	protected boolean shouldExpandOnCreate() {
-		return getTaskData().isNew() || hasIncoming;
-	}
-
-	@Override
-	protected Control createContent(FormToolkit toolkit, Composite parent) {
-		attributesComposite = toolkit.createComposite(parent);
-		attributesComposite.addListener(SWT.MouseDown, new Listener() {
-			public void handleEvent(Event event) {
-				Control focus = event.display.getFocusControl();
-				if (focus instanceof Text
-						&& ((Text) focus).getEditable() == false)
-					getManagedForm().getForm().setFocus();
-			}
-		});
-
-		GridLayout attributesLayout = EditorUtil.createSectionClientLayout();
-		attributesLayout.numColumns = 2;
-		attributesLayout.horizontalSpacing = 7;
-		attributesLayout.verticalSpacing = 6;
-		attributesComposite.setLayout(attributesLayout);
-
-		GridData attributesData = new GridData(GridData.FILL_BOTH);
-		attributesData.horizontalSpan = 1;
-		attributesData.grabExcessVerticalSpace = false;
-		attributesComposite.setLayoutData(attributesData);
-
-		createAttributeControls(attributesComposite, toolkit,
-				attributesLayout.numColumns);
-		toolkit.paintBordersFor(attributesComposite);
-
-		return attributesComposite;
-	}
-
-	@Override
-	protected void fillToolBar(ToolBarManager toolBar) {
-		UpdateRepositoryConfigurationAction repositoryConfigRefresh = new UpdateRepositoryConfigurationAction() {
-			@Override
-			public void run() {
-				getTaskEditorPage().showEditorBusy(true);
-				final TaskJob job = TasksUiInternal.getJobFactory()
-						.createUpdateRepositoryConfigurationJob(
-								getTaskEditorPage().getConnector(),
-								getTaskEditorPage().getTaskRepository(),
-								getTaskEditorPage().getTask());
-				job.addJobChangeListener(new JobChangeAdapter() {
-					@Override
-					public void done(IJobChangeEvent event) {
-						PlatformUI.getWorkbench().getDisplay()
-								.asyncExec(new Runnable() {
-									public void run() {
-										getTaskEditorPage().showEditorBusy(
-												false);
-										if (job.getStatus() != null) {
-											getTaskEditorPage()
-													.getTaskEditor()
-													.setStatus(
-															Messages.TaskEditorAttributePart_Updating_of_repository_configuration_failed,
-															Messages.TaskEditorAttributePart_Update_Failed,
-															job.getStatus());
-										} else {
-											getTaskEditorPage().refresh();
-										}
-									}
-								});
-					}
-				});
-				job.setUser(true);
-				job.setProperty(WorkbenchUtil.SHOW_IN_TASKBAR_ICON_PROPERTY,
-						Boolean.TRUE);
-				job.setPriority(Job.INTERACTIVE);
-				job.schedule();
-			};
-
-		};
-		repositoryConfigRefresh
-				.setImageDescriptor(TasksUiImages.REPOSITORY_SYNCHRONIZE_SMALL);
-		repositoryConfigRefresh.selectionChanged(new StructuredSelection(
-				getTaskEditorPage().getTaskRepository()));
-		repositoryConfigRefresh
-				.setToolTipText(Messages.TaskEditorAttributePart_Refresh_Attributes);
-		toolBar.add(repositoryConfigRefresh);
-	}
-
-	private void initialize() {
-		attributeEditors = new ArrayList<AbstractAttributeEditor>();
-		hasIncoming = false;
-
-		TaskAttribute root = getTaskData().getRoot();
-		List<TaskAttribute> attributes = new LinkedList<TaskAttribute>();
-		TaskAttribute milestones = root
-				.getAttribute(GitHubTaskAttributes.MILESTONE.getId());
-		if (milestones != null)
-			attributes.add(milestones);
-
-		TaskAttribute labels = root.getAttribute(GitHubTaskAttributes.LABELS
-				.getId());
-		if (labels != null)
-			attributes.add(labels);
-
-		for (TaskAttribute attribute : attributes) {
-			AbstractAttributeEditor attributeEditor = createAttributeEditor(attribute);
-			if (attributeEditor != null) {
-				attributeEditors.add(attributeEditor);
-				if (getModel().hasIncomingChanges(attribute))
-					hasIncoming = true;
-			}
-		}
-	}
-
-	@Override
-	public boolean setFormInput(Object input) {
-		if (input instanceof String) {
-			String text = (String) input;
-			Map<String, TaskAttribute> attributes = getTaskData().getRoot()
-					.getAttributes();
-			for (TaskAttribute attribute : attributes.values())
-				if (text.equals(attribute.getId())) {
-					TaskAttributeMetaData properties = attribute.getMetaData();
-					if (TaskAttribute.KIND_DEFAULT.equals(properties.getKind()))
-						selectReveal(attribute);
-				}
-		}
-		return super.setFormInput(input);
-	}
-
-	public void selectReveal(TaskAttribute attribute) {
-		if (attribute == null)
-			return;
-
-		if (!getSection().isExpanded())
-			CommonFormUtil.setExpanded(getSection(), true);
-
-		EditorUtil.reveal(getTaskEditorPage().getManagedForm().getForm(),
-				attribute.getId());
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/IssueLabelAttributeEditor.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/IssueLabelAttributeEditor.java
deleted file mode 100644
index 559f6ae5..00000000
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/IssueLabelAttributeEditor.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011 GitHub Inc.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *    Kevin Sawicki (GitHub Inc.) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.github.ui.internal;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.layout.GridLayoutFactory;
-import org.eclipse.jface.window.Window;
-import org.eclipse.mylyn.internal.tasks.ui.notifications.TaskDiffUtil;
-import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
-import org.eclipse.mylyn.tasks.core.data.TaskDataModel;
-import org.eclipse.mylyn.tasks.ui.editors.AbstractAttributeEditor;
-import org.eclipse.mylyn.tasks.ui.editors.LayoutHint;
-import org.eclipse.mylyn.tasks.ui.editors.LayoutHint.ColumnSpan;
-import org.eclipse.mylyn.tasks.ui.editors.LayoutHint.RowSpan;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * Editor part for viewing an issue's labels.
- */
-public class IssueLabelAttributeEditor extends AbstractAttributeEditor {
-
-	/**
-	 * LABEL_WIDTH
-	 */
-	public static final int LABEL_WIDTH = 80;
-
-	/**
-	 * LABEL_COLUMNS
-	 */
-	public static final int LABEL_COLUMNS = 12;
-
-	private class NewLabelAction extends Action {
-
-		public NewLabelAction() {
-			super(Messages.IssueLabelAttributeEditor_ActionNewLabel,
-					IAction.AS_PUSH_BUTTON);
-		}
-
-		public void run() {
-			InputDialog dialog = new InputDialog(getControl().getShell(),
-					Messages.IssueLabelAttributeEditor_TitleNewLabel,
-					Messages.IssueLabelAttributeEditor_DescriptionNewLabel,
-					"", new IInputValidator() { //$NON-NLS-1$
-
-						public String isValid(String newText) {
-							if (newText == null || newText.trim().length() == 0)
-								return Messages.IssueLabelAttributeEditor_MessageEnterName;
-							return null;
-						}
-					});
-			if (Window.OK == dialog.open()
-					&& !getTaskAttribute().getValues().contains(
-							dialog.getValue())) {
-				getTaskAttribute().addValue(dialog.getValue());
-				markLabelsChanged();
-				refreshLabels();
-			}
-		}
-
-	}
-
-	private class RemoveLabelAction extends Action {
-
-		private String label;
-
-		public RemoveLabelAction(String label) {
-			super(Messages.IssueLabelAttributeEditor_ActionRemoveLabel,
-					IAction.AS_PUSH_BUTTON);
-			this.label = label;
-		}
-
-		public void run() {
-			if (getTaskAttribute().getValues().contains(label)) {
-				getTaskAttribute().removeValue(label);
-				markLabelsChanged();
-				refreshLabels();
-			}
-		}
-
-	}
-
-	private class LabelAction extends Action {
-
-		public LabelAction(String label) {
-			super(label, IAction.AS_PUSH_BUTTON);
-			setImageDescriptor(GitHubImages.DESC_GITHUB_ISSUE_LABEL);
-		}
-
-		public void run() {
-			if (!getTaskAttribute().getValues().contains(getText())) {
-				getTaskAttribute().addValue(getText());
-				markLabelsChanged();
-				refreshLabels();
-			}
-		}
-	}
-
-	private Composite displayArea;
-	private boolean layout = false;
-	private Composite labelsArea;
-	private List<CLabel> labelControls = new LinkedList<CLabel>();
-	private FormToolkit toolkit;
-	private Comparator<String> labelComparator = new Comparator<String>() {
-
-		public int compare(String o1, String o2) {
-			return o1.compareToIgnoreCase(o2);
-		}
-	};
-
-	/**
-	 * @param manager
-	 * @param taskAttribute
-	 */
-	public IssueLabelAttributeEditor(TaskDataModel manager,
-			TaskAttribute taskAttribute) {
-		super(manager, taskAttribute);
-		setLayoutHint(new LayoutHint(RowSpan.SINGLE, ColumnSpan.MULTIPLE));
-	}
-
-	private void refreshLabels() {
-		for (CLabel labelControl : this.labelControls)
-			labelControl.dispose();
-		this.labelControls.clear();
-
-		Image labelImage = GitHubImages
-				.get(GitHubImages.GITHUB_ISSUE_LABEL_OBJ);
-		List<String> labels = new LinkedList<String>(getTaskAttribute()
-				.getValues());
-		Collections.sort(labels, this.labelComparator);
-		if (!labels.isEmpty())
-			for (final String label : labels) {
-				CLabel cLabel = new CLabel(labelsArea, SWT.NONE);
-				MenuManager manager = new MenuManager();
-				manager.setRemoveAllWhenShown(true);
-				manager.addMenuListener(new IMenuListener() {
-
-					public void menuAboutToShow(IMenuManager manager) {
-						manager.add(new RemoveLabelAction(label));
-					}
-				});
-				Menu menu = manager.createContextMenu(cLabel);
-				cLabel.setMenu(menu);
-				String shortened = TaskDiffUtil.shortenText(displayArea, label,
-						LABEL_WIDTH);
-				cLabel.setImage(labelImage);
-				cLabel.setText(shortened);
-				cLabel.setForeground(toolkit.getColors().getForeground());
-				if (!shortened.equals(label))
-					cLabel.setToolTipText(label);
-				this.labelControls.add(cLabel);
-			}
-		else
-			this.labelControls.add(new CLabel(labelsArea, SWT.NONE));
-
-		if (this.layout)
-			displayArea.getParent().getParent().layout(true, true);
-	}
-
-	private void markLabelsChanged() {
-		getModel().attributeChanged(getTaskAttribute());
-	}
-
-	/**
-	 * @see org.eclipse.mylyn.tasks.ui.editors.AbstractAttributeEditor#createControl(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.ui.forms.widgets.FormToolkit)
-	 */
-	public void createControl(Composite parent, FormToolkit toolkit) {
-		this.toolkit = toolkit;
-		displayArea = toolkit.createComposite(parent);
-		displayArea.setBackgroundMode(SWT.INHERIT_FORCE);
-		GridDataFactory.fillDefaults().grab(true, true).applyTo(displayArea);
-		GridLayoutFactory.fillDefaults().numColumns(2).applyTo(displayArea);
-
-		final ToolBar toolbar = new ToolBar(displayArea, SWT.FLAT);
-		toolkit.adapt(toolbar, false, false);
-		final ToolItem addItem = new ToolItem(toolbar, SWT.DROP_DOWN);
-		addItem.setImage(GitHubImages.get(GitHubImages.GITHUB_ADD_OBJ));
-		addItem.setToolTipText(Messages.IssueLabelAttributeEditor_TooltipAddLabel);
-
-		MenuManager manager = new MenuManager();
-		manager.setRemoveAllWhenShown(true);
-		manager.addMenuListener(new IMenuListener() {
-
-			public void menuAboutToShow(IMenuManager manager) {
-				manager.add(new NewLabelAction());
-				manager.add(new Separator());
-				List<String> labels = new LinkedList<String>(getTaskAttribute()
-						.getOptions().values());
-				labels.removeAll(getTaskAttribute().getValues());
-				for (String label : labels)
-					manager.add(new LabelAction(label));
-				manager.update();
-			}
-		});
-		final Menu menu = manager.createContextMenu(displayArea);
-		addItem.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent e) {
-				Rectangle toolItemBounds = addItem.getBounds();
-				Point location = toolbar.toDisplay(toolItemBounds.x,
-						toolItemBounds.y + toolItemBounds.height);
-				menu.setLocation(location);
-				menu.setVisible(true);
-			}
-
-		});
-
-		labelsArea = toolkit.createComposite(displayArea);
-		labelsArea.setBackgroundMode(SWT.INHERIT_FORCE);
-		labelsArea.setBackground(null);
-		GridLayoutFactory.fillDefaults().numColumns(LABEL_COLUMNS)
-				.applyTo(labelsArea);
-		GridDataFactory.swtDefaults().grab(true, true).applyTo(labelsArea);
-		refreshLabels();
-		setControl(displayArea);
-		layout = true;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/IssueSummaryPart.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/IssueSummaryPart.java
deleted file mode 100644
index b4462152..00000000
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/IssueSummaryPart.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011 GitHub Inc.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *    Kevin Sawicki (GitHub Inc.) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.github.ui.internal;
-
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.layout.GridLayoutFactory;
-import org.eclipse.mylyn.github.internal.GitHubTaskAttributes;
-import org.eclipse.mylyn.internal.tasks.ui.editors.DateAttributeEditor;
-import org.eclipse.mylyn.internal.tasks.ui.editors.EditorUtil;
-import org.eclipse.mylyn.internal.tasks.ui.editors.RichTextAttributeEditor;
-import org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorSummaryPart;
-import org.eclipse.mylyn.tasks.core.IRepositoryPerson;
-import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
-import org.eclipse.mylyn.tasks.ui.editors.AbstractAttributeEditor;
-import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPart;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * Issue summary task editor part modeled after {@link TaskEditorSummaryPart}
- * but displaying reporter and assignee avatar images.
- */
-public class IssueSummaryPart extends AbstractTaskEditorPart {
-
-	/**
-	 * AVATAR_SIZE
-	 */
-	public static final int AVATAR_SIZE = 48;
-
-	private AbstractAttributeEditor summaryEditor;
-
-	private String reporterAvatarId;
-
-	private String assigneeAvatarId;
-
-	/**
-	 * Create issue summary part
-	 * 
-	 * @param reporterAvatarId
-	 * @param assigneeAvatarId
-	 */
-	public IssueSummaryPart(String reporterAvatarId, String assigneeAvatarId) {
-		setPartName("Summary"); //$NON-NLS-1$
-		this.reporterAvatarId = reporterAvatarId;
-		this.assigneeAvatarId = assigneeAvatarId;
-	}
-
-	private void addAttribute(Composite composite, FormToolkit toolkit,
-			TaskAttribute attribute) {
-		addAttribute(composite, toolkit, attribute,
-				EditorUtil.HEADER_COLUMN_MARGIN);
-	}
-
-	private void addAttribute(Composite composite, FormToolkit toolkit,
-			TaskAttribute attribute, int indent) {
-		addAttribute(composite, toolkit, attribute, indent, true);
-	}
-
-	private void addAttribute(Composite composite, FormToolkit toolkit,
-			TaskAttribute attribute, int indent, boolean showLabel) {
-		AbstractAttributeEditor editor = createAttributeEditor(attribute);
-		if (editor == null)
-			return;
-
-		editor.setReadOnly(true);
-		editor.setDecorationEnabled(false);
-
-		if (showLabel) {
-			editor.createLabelControl(composite, toolkit);
-			GridDataFactory.defaultsFor(editor.getLabelControl())
-					.indent(indent, 0).applyTo(editor.getLabelControl());
-		}
-
-		if (isAttribute(attribute, TaskAttribute.DATE_MODIFICATION)
-				&& editor instanceof DateAttributeEditor)
-			((DateAttributeEditor) editor).setShowTime(true);
-
-		editor.createControl(composite, toolkit);
-		getTaskEditorPage().getAttributeEditorToolkit().adapt(editor);
-	}
-
-	private boolean isAttribute(TaskAttribute attribute, String id) {
-		return attribute
-				.getId()
-				.equals(attribute.getTaskData().getAttributeMapper()
-						.mapToRepositoryKey(attribute.getParentAttribute(), id));
-	}
-
-	private void addSummaryText(Composite composite, final FormToolkit toolkit) {
-		TaskAttribute summaryAttrib = getTaskData().getRoot()
-				.getMappedAttribute(TaskAttribute.SUMMARY);
-		summaryEditor = createAttributeEditor(summaryAttrib);
-		if (summaryEditor == null)
-			return;
-
-		if (summaryAttrib.getMetaData().isReadOnly())
-			summaryEditor.setReadOnly(true);
-
-		if (summaryEditor instanceof RichTextAttributeEditor) {
-			Composite roundedBorder = EditorUtil.createBorder(composite,
-					toolkit, !summaryEditor.isReadOnly());
-			summaryEditor.createControl(roundedBorder, toolkit);
-			EditorUtil.setHeaderFontSizeAndStyle(summaryEditor.getControl());
-		} else {
-			final Composite border = toolkit.createComposite(composite);
-			GridDataFactory.fillDefaults().align(SWT.FILL, SWT.BEGINNING)
-					.hint(EditorUtil.MAXIMUM_WIDTH, SWT.DEFAULT)
-					.grab(true, false).applyTo(border);
-			GridLayoutFactory.fillDefaults().margins(1, 4).applyTo(border);
-			summaryEditor.createControl(border, toolkit);
-			GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
-					.grab(true, false).applyTo(summaryEditor.getControl());
-			toolkit.paintBordersFor(border);
-		}
-		getTaskEditorPage().getAttributeEditorToolkit().adapt(summaryEditor);
-	}
-
-	private TaskAttribute getAttribute(GitHubTaskAttributes attribute) {
-		return getAttribute(attribute.getId());
-	}
-
-	private TaskAttribute getAttribute(String id) {
-		return getTaskData().getRoot().getAttribute(id);
-	}
-
-	private boolean addAvatarPart(Composite parent, FormToolkit toolkit,
-			TaskAttribute avatarAttribute, IRepositoryPerson person) {
-		if (avatarAttribute == null || avatarAttribute.getValue().length() == 0)
-			return false;
-
-		AvatarLabel label = new AvatarLabel(GitHubUi.getDefault().getStore(),
-				person, avatarAttribute);
-		label.create(parent, toolkit);
-		return true;
-	}
-
-	/**
-	 * Create control
-	 * 
-	 * @param parent
-	 * @param toolkit
-	 */
-	public void createControl(Composite parent, FormToolkit toolkit) {
-		Composite composite = toolkit.createComposite(parent);
-		GridLayout layout = EditorUtil.createSectionClientLayout();
-		layout.numColumns = 1;
-		layout.marginHeight = 0;
-		layout.marginTop = 0;
-		layout.marginWidth = 0;
-		layout.verticalSpacing = 3;
-		composite.setLayout(layout);
-
-		TaskAttribute reporter = getAttribute(GitHubTaskAttributes.REPORTER);
-		if (reporter != null) {
-			IRepositoryPerson person = getTaskData().getAttributeMapper()
-					.getRepositoryPerson(reporter);
-			if (this.reporterAvatarId != null
-					&& addAvatarPart(composite, toolkit,
-							getAttribute(this.reporterAvatarId), person))
-				layout.numColumns++;
-		}
-		addSummaryText(composite, toolkit);
-
-		TaskAttribute assignee = getAttribute(GitHubTaskAttributes.ASSIGNEE);
-		if (assignee != null) {
-			IRepositoryPerson person = getTaskData().getAttributeMapper()
-					.getRepositoryPerson(assignee);
-			if (this.assigneeAvatarId != null
-					&& addAvatarPart(composite, toolkit,
-							getAttribute(this.assigneeAvatarId), person))
-				layout.numColumns++;
-		}
-
-		if (needsHeader())
-			createHeaderLayout(composite, toolkit);
-
-		toolkit.paintBordersFor(composite);
-		setControl(composite);
-	}
-
-	private Composite createHeaderLayout(Composite composite,
-			FormToolkit toolkit) {
-		Composite headerComposite = toolkit.createComposite(composite);
-		GridLayout layout = new GridLayout(1, false);
-		layout.verticalSpacing = 1;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		headerComposite.setLayout(layout);
-		GridDataFactory.fillDefaults().grab(true, false)
-				.applyTo(headerComposite);
-
-		TaskAttribute root = getTaskData().getRoot();
-
-		addAttribute(headerComposite, toolkit,
-				root.getMappedAttribute(TaskAttribute.STATUS), 0);
-
-		addAttribute(headerComposite, toolkit,
-				root.getMappedAttribute(TaskAttribute.DATE_CREATION));
-
-		addAttribute(headerComposite, toolkit,
-				root.getMappedAttribute(TaskAttribute.DATE_MODIFICATION));
-
-		// ensure layout does not wrap
-		layout.numColumns = headerComposite.getChildren().length;
-
-		// ensure that the composite does not show a bunch of blank space
-		if (layout.numColumns == 0) {
-			layout.numColumns = 1;
-			toolkit.createLabel(headerComposite, " "); //$NON-NLS-1$
-		}
-		return headerComposite;
-	}
-
-	private boolean needsHeader() {
-		return !getTaskData().isNew();
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.AbstractFormPart#setFocus()
-	 */
-	public void setFocus() {
-		if (summaryEditor != null)
-			summaryEditor.getControl().setFocus();
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/Messages.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/Messages.java
index 9c1cc2dd..d3ce3d47 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/Messages.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/Messages.java
@@ -37,93 +37,6 @@ public class Messages extends NLS {
 	/** */
 	public static String CredentialsWizardPage_Title;
 
-	/** */
-	public static String GitHubRepositoryQueryPage_ErrorLoading;
-
-	/** */
-	public static String GitHubRepositoryQueryPage_AssigneeLabel;
-
-	/** */
-	public static String GitHubRepositoryQueryPage_Description;
-
-	/** */
-	public static String GitHubRepositoryQueryPage_ErrorStatus;
-
-	/** */
-	public static String GitHubRepositoryQueryPage_LabelsLabel;
-
-	/** */
-	public static String GitHubRepositoryQueryPage_MentionsLabel;
-
-	/** */
-	public static String GitHubRepositoryQueryPage_MilestoneLabel;
-
-	/** */
-	public static String GitHubRepositoryQueryPage_MilestoneNone;
-
-	/** */
-	public static String GitHubRepositoryQueryPage_StatusClosed;
-
-	/** */
-	public static String GitHubRepositoryQueryPage_StatusLabel;
-
-	/** */
-	public static String GitHubRepositoryQueryPage_StatusOpen;
-
-	/** */
-	public static String GitHubRepositoryQueryPage_TaskLoadingLabels;
-
-	/** */
-	public static String GitHubRepositoryQueryPage_TaskLoadingMilestones;
-
-	/** */
-	public static String GitHubRepositoryQueryPage_TitleLabel;
-
-	/** */
-	public static String GitHubRepositoryQueryPage_TooltipUpdateRepository;
-
-	/** */
-	public static String GitHubRepositorySettingsPage_Description;
-
-	/** */
-	public static String GitHubRepositorySettingsPage_ErrorMalformedUrl;
-
-	/** */
-	public static String GitHubRepositorySettingsPage_StatusError;
-
-	/** */
-	public static String GitHubRepositorySettingsPage_StatusSuccess;
-
-	/** */
-	public static String GitHubRepositorySettingsPage_TaskContactingServer;
-
-	/** */
-	public static String GitHubRepositorySettingsPage_TaskValidating;
-
-	/** */
-	public static String GitHubRepositorySettingsPage_Title;
-
-	/** */
-	public static String GitHubTaskEditorPageFactory_PageText;
-
-	/** */
-	public static String IssueLabelAttributeEditor_ActionNewLabel;
-
-	/** */
-	public static String IssueLabelAttributeEditor_ActionRemoveLabel;
-
-	/** */
-	public static String IssueLabelAttributeEditor_DescriptionNewLabel;
-
-	/** */
-	public static String IssueLabelAttributeEditor_MessageEnterName;
-
-	/** */
-	public static String IssueLabelAttributeEditor_TitleNewLabel;
-
-	/** */
-	public static String IssueLabelAttributeEditor_TooltipAddLabel;
-
 	/** */
 	public static String RepositorySelectionWizardPage_Description;
 
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/RepositorySelectionWizardPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/RepositorySelectionWizardPage.java
index c26e13cf..94b80d73 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/RepositorySelectionWizardPage.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/RepositorySelectionWizardPage.java
@@ -33,7 +33,7 @@ import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.mylyn.github.internal.GitHub;
+import org.eclipse.mylyn.internal.github.core.GitHub;
 import org.eclipse.mylyn.internal.github.core.gist.GistConnector;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.ui.TasksUi;
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/messages.properties b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/messages.properties
index 0cb0e3aa..f2f485b4 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/messages.properties
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/messages.properties
@@ -4,35 +4,6 @@ CredentialsWizardPage_ErrorUser=Enter GitHub login name
 CredentialsWizardPage_LabelPassword=Password:
 CredentialsWizardPage_LabelUser=User ID:
 CredentialsWizardPage_Title=GitHub Credentials
-GitHubRepositoryQueryPage_ErrorLoading=Error loading labels and milestones
-GitHubRepositoryQueryPage_AssigneeLabel=Assigned to:
-GitHubRepositoryQueryPage_Description=Issue query settings
-GitHubRepositoryQueryPage_ErrorStatus=Select a status
-GitHubRepositoryQueryPage_LabelsLabel=Labels
-GitHubRepositoryQueryPage_MentionsLabel=Mentioning:
-GitHubRepositoryQueryPage_MilestoneLabel=Milestone:
-GitHubRepositoryQueryPage_MilestoneNone=None
-GitHubRepositoryQueryPage_StatusClosed=Closed
-GitHubRepositoryQueryPage_StatusLabel=Status:
-GitHubRepositoryQueryPage_StatusOpen=Open
-GitHubRepositoryQueryPage_TaskLoadingLabels=Loading labels
-GitHubRepositoryQueryPage_TaskLoadingMilestones=Loading milestones
-GitHubRepositoryQueryPage_TitleLabel=Title:
-GitHubRepositoryQueryPage_TooltipUpdateRepository=Update milestones and labels
-GitHubRepositorySettingsPage_Description=Enter repository location and credentials
-GitHubRepositorySettingsPage_StatusError=Error validating settings: {0}
-GitHubRepositorySettingsPage_ErrorMalformedUrl=Server URL must be in the form http://github.com/user/project
-GitHubRepositorySettingsPage_StatusSuccess=Success\!
-GitHubRepositorySettingsPage_TaskContactingServer=Contacting server...
-GitHubRepositorySettingsPage_TaskValidating=Validating settings
-GitHubRepositorySettingsPage_Title=GitHub Issue Repository Settings
-GitHubTaskEditorPageFactory_PageText=GitHub
-IssueLabelAttributeEditor_ActionNewLabel=New Label...
-IssueLabelAttributeEditor_ActionRemoveLabel=Remove Label
-IssueLabelAttributeEditor_DescriptionNewLabel=Label Name:
-IssueLabelAttributeEditor_MessageEnterName=Enter label name
-IssueLabelAttributeEditor_TitleNewLabel=New Label
-IssueLabelAttributeEditor_TooltipAddLabel=Add Label...
 RepositorySelectionWizardPage_Description=Select repositories to import
 RepositorySelectionWizardPage_ErrorLoading=Error loading repositories: {0}
 RepositorySelectionWizardPage_LabelAddGist=Add Gist task repository
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CreateGistHandler.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CreateGistHandler.java
new file mode 100644
index 00000000..95d50f85
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CreateGistHandler.java
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.ui.gist;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Set;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.egit.github.core.client.GitHubClient;
+import org.eclipse.egit.github.core.service.GistService;
+import org.eclipse.jface.text.ITextSelection;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
+import org.eclipse.mylyn.commons.net.AuthenticationType;
+import org.eclipse.mylyn.github.ui.internal.GitHubUi;
+import org.eclipse.mylyn.internal.github.core.gist.GistConnector;
+import org.eclipse.mylyn.tasks.core.TaskRepository;
+import org.eclipse.mylyn.tasks.ui.TasksUi;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+public class CreateGistHandler extends AbstractHandler {
+
+	/**
+	 * @see org.eclipse.core.commands.AbstractHandler#isEnabled()
+	 */
+	public boolean isEnabled() {
+		return !TasksUi.getRepositoryManager()
+				.getRepositories(GistConnector.KIND).isEmpty();
+	}
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		IEditorPart editor = HandlerUtil.getActiveEditor(event);
+		ISelection selection = HandlerUtil.getCurrentSelection(event);
+		if(selection != null) {
+			if(selection instanceof ITextSelection) {
+				ITextSelection text = (ITextSelection) selection;
+				IEditorInput input = editor.getEditorInput();
+				if(input instanceof IFileEditorInput) {
+					// only use the first repository, in the future provide a selection if multiple exist
+					IFileEditorInput fileInput = (IFileEditorInput) input;
+					IFile file = fileInput.getFile();
+					createGistJob(file.getName(), file.getFileExtension(), text.getText());
+				}
+			} else
+			if(selection instanceof IStructuredSelection) {
+				IStructuredSelection structuredSelection = (IStructuredSelection) selection;
+				Object obj = structuredSelection.getFirstElement();
+				if(obj instanceof IFile) {
+					IFile file = (IFile) obj;
+					createGistJob(file);
+				}
+			}
+		}
+		return null;
+	}
+
+	private void createGistJob(String name, String extension, String contents) {
+		Set<TaskRepository> repositories = TasksUi.getRepositoryManager()
+				.getRepositories(GistConnector.KIND);
+
+		TaskRepository repository = repositories.iterator().next();
+		GitHubClient client = new GitHubClient();
+		AuthenticationCredentials credentials = repository
+				.getCredentials(AuthenticationType.REPOSITORY);
+		String userName = null;
+		if (credentials != null) {
+			userName = credentials.getUserName();
+			client.setCredentials(userName, credentials.getPassword());
+		}
+		GistService service = new GistService(client);
+		CreateGistJob job = new CreateGistJob("Creating Gist", name, contents,
+				service, userName);
+		job.setSystem(true);
+		job.schedule();
+	}
+
+	private void createGistJob(IFile file) {
+		BufferedReader br = null;
+		try {
+			br = new BufferedReader(new InputStreamReader(file.getContents()));
+			String line;
+			StringBuilder result = new StringBuilder();
+			while ((line = br.readLine()) != null)
+				result.append(line).append('\n');
+
+			String contents = result.toString();
+			createGistJob(file.getName(), file.getFileExtension(), contents);
+		} catch (CoreException e) {
+			GitHubUi.logError(e);
+		} catch (IOException e) {
+			GitHubUi.logError(e);
+		} finally {
+			if (br != null)
+				try {
+					br.close();
+				} catch (IOException e) {
+					GitHubUi.logError(e);
+				}
+		}
+	}
+
+}
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CreateGistJob.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CreateGistJob.java
new file mode 100644
index 00000000..dbcd1d83
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CreateGistJob.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.ui.gist;
+
+import java.io.IOException;
+import java.util.Collections;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.egit.github.core.Gist;
+import org.eclipse.egit.github.core.GistFile;
+import org.eclipse.egit.github.core.User;
+import org.eclipse.egit.github.core.service.GistService;
+import org.eclipse.mylyn.github.ui.internal.GitHubUi;
+import org.eclipse.ui.PlatformUI;
+
+public class CreateGistJob extends Job {
+
+	private String title;
+	private String content;
+	private GistService service;
+	private String user;
+
+	public CreateGistJob(String name, String title, String content,
+			GistService service, String user) {
+		super(name);
+		this.title = title;
+		this.content = content;
+		this.service = service;
+		this.user = user;
+	}
+
+	@Override
+	protected IStatus run(IProgressMonitor monitor) {
+		try {
+			Gist gist = new Gist().setPublic(true);
+			if (user != null)
+				gist.setUser(new User().setLogin(user));
+			gist.setDescription(title);
+			GistFile file = new GistFile().setContent(content);
+			gist.setFiles(Collections.singletonMap(title, file));
+			final Gist created = service.createGist(gist);
+			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
+				@SuppressWarnings("restriction")
+				public void run() {
+					GistNotificationPopup popup = new GistNotificationPopup(
+							PlatformUI.getWorkbench().getDisplay(), created, title);
+					popup.create();
+					popup.open();
+				}
+			});
+		} catch (IOException e) {
+			GitHubUi.logError(e);
+		}
+		return Status.OK_STATUS;
+	}
+}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistNotificationPopup.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistNotificationPopup.java
new file mode 100644
index 00000000..d5365e6e
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistNotificationPopup.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.ui.gist;
+
+import java.util.Set;
+
+import org.eclipse.egit.github.core.Gist;
+import org.eclipse.mylyn.github.ui.internal.GitHubImages;
+import org.eclipse.mylyn.internal.github.core.gist.GistConnector;
+import org.eclipse.mylyn.internal.provisional.commons.ui.AbstractNotificationPopup;
+import org.eclipse.mylyn.tasks.core.TaskRepository;
+import org.eclipse.mylyn.tasks.ui.TasksUi;
+import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
+
+@SuppressWarnings("restriction")
+public class GistNotificationPopup extends AbstractNotificationPopup {
+
+	private Gist gist;
+
+	private String title;
+
+	public GistNotificationPopup(Display display, Gist gist, String title) {
+		super(display);
+		this.gist = gist;
+		this.title = title;
+	}
+
+	@Override
+	protected void createContentArea(Composite composite) {
+		composite.setLayout(new GridLayout(1, true));
+		Label label = new Label(composite, SWT.NONE);
+		label.setText("Title: " + title);
+		Link link = new Link(composite, SWT.WRAP);
+		link.setText("Created Gist: <a>" + gist.getId() + "</a>");
+		link.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		link.setBackground(composite.getBackground());
+		link.addSelectionListener(new SelectionAdapter() {
+
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				Set<TaskRepository> repositories = TasksUi
+						.getRepositoryManager().getRepositories(
+								GistConnector.KIND);
+				if (!repositories.isEmpty())
+					TasksUiUtil.openTask(repositories.iterator().next(), gist.getId());
+			}
+		});
+	}
+
+	@Override
+	protected String getPopupShellTitle() {
+		return "GitHub Notification";
+	}
+
+	@Override
+	protected Image getPopupShellImage(int maximumHeight) {
+		return GitHubImages.get(GitHubImages.GITHUB_LOGO_OBJ);
+	}
+
+}
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistTaskEditorPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistTaskEditorPage.java
index 80ab3ede..867b9286 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistTaskEditorPage.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistTaskEditorPage.java
@@ -25,8 +25,8 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.github.ui.internal.IssueSummaryPart;
 import org.eclipse.mylyn.internal.github.core.gist.GistAttribute;
+import org.eclipse.mylyn.internal.github.ui.issue.IssueSummaryPart;
 import org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorActionPart;
 import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPage;
 import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPart;
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueAttributePart.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueAttributePart.java
new file mode 100644
index 00000000..e467b493
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueAttributePart.java
@@ -0,0 +1,244 @@
+/*******************************************************************************
+ *  Copyright (c) 2011 GitHub Inc.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *    Kevin Sawicki (GitHub Inc.) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.ui.issue;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.jobs.IJobChangeEvent;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.jobs.JobChangeAdapter;
+import org.eclipse.jface.action.ToolBarManager;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.mylyn.internal.github.core.issue.IssueAttribute;
+import org.eclipse.mylyn.internal.provisional.commons.ui.CommonFormUtil;
+import org.eclipse.mylyn.internal.provisional.commons.ui.WorkbenchUtil;
+import org.eclipse.mylyn.internal.tasks.ui.editors.AbstractTaskEditorSection;
+import org.eclipse.mylyn.internal.tasks.ui.editors.EditorUtil;
+import org.eclipse.mylyn.internal.tasks.ui.editors.Messages;
+import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
+import org.eclipse.mylyn.internal.tasks.ui.views.UpdateRepositoryConfigurationAction;
+import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
+import org.eclipse.mylyn.tasks.core.data.TaskAttributeMetaData;
+import org.eclipse.mylyn.tasks.core.sync.TaskJob;
+import org.eclipse.mylyn.tasks.ui.TasksUiImages;
+import org.eclipse.mylyn.tasks.ui.editors.AbstractAttributeEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+/**
+ * GitHub issue task editor attribute part that display labels and milestone
+ * attribute editors.
+ */
+public class IssueAttributePart extends AbstractTaskEditorSection {
+
+	private List<AbstractAttributeEditor> attributeEditors;
+
+	private boolean hasIncoming;
+
+	private Composite attributesComposite;
+
+	public IssueAttributePart() {
+		setPartName(Messages.TaskEditorAttributePart_Attributes);
+	}
+
+	@Override
+	protected AbstractAttributeEditor createAttributeEditor(
+			TaskAttribute attribute) {
+		if (IssueAttribute.LABELS.getId().equals(attribute.getId())) {
+			return new IssueLabelAttributeEditor(getModel(), attribute);
+		} else if (IssueAttribute.MILESTONE.getId().equals(
+				attribute.getId())) {
+			return super.createAttributeEditor(attribute);
+		}
+		return null;
+	}
+
+	private void createAttributeControls(Composite attributesComposite,
+			FormToolkit toolkit, int columnCount) {
+		for (AbstractAttributeEditor attributeEditor : attributeEditors) {
+			if (attributeEditor.hasLabel())
+				attributeEditor
+						.createLabelControl(attributesComposite, toolkit);
+			attributeEditor.createControl(attributesComposite, toolkit);
+			Object data = attributeEditor.getControl().getLayoutData();
+			if (data == null) {
+				data = GridDataFactory.swtDefaults().create();
+				attributeEditor.getControl().setLayoutData(data);
+			}
+			if (data instanceof GridData)
+				((GridData) data).widthHint = 140;
+			getTaskEditorPage().getAttributeEditorToolkit().adapt(
+					attributeEditor);
+		}
+	}
+
+	@Override
+	public void createControl(Composite parent, final FormToolkit toolkit) {
+		initialize();
+		super.createControl(parent, toolkit);
+	}
+
+	@Override
+	protected String getInfoOverlayText() {
+		return null;
+	}
+
+	@Override
+	protected boolean shouldExpandOnCreate() {
+		return getTaskData().isNew() || hasIncoming;
+	}
+
+	@Override
+	protected Control createContent(FormToolkit toolkit, Composite parent) {
+		attributesComposite = toolkit.createComposite(parent);
+		attributesComposite.addListener(SWT.MouseDown, new Listener() {
+			public void handleEvent(Event event) {
+				Control focus = event.display.getFocusControl();
+				if (focus instanceof Text
+						&& ((Text) focus).getEditable() == false)
+					getManagedForm().getForm().setFocus();
+			}
+		});
+
+		GridLayout attributesLayout = EditorUtil.createSectionClientLayout();
+		attributesLayout.numColumns = 2;
+		attributesLayout.horizontalSpacing = 7;
+		attributesLayout.verticalSpacing = 6;
+		attributesComposite.setLayout(attributesLayout);
+
+		GridData attributesData = new GridData(GridData.FILL_BOTH);
+		attributesData.horizontalSpan = 1;
+		attributesData.grabExcessVerticalSpace = false;
+		attributesComposite.setLayoutData(attributesData);
+
+		createAttributeControls(attributesComposite, toolkit,
+				attributesLayout.numColumns);
+		toolkit.paintBordersFor(attributesComposite);
+
+		return attributesComposite;
+	}
+
+	@Override
+	protected void fillToolBar(ToolBarManager toolBar) {
+		UpdateRepositoryConfigurationAction repositoryConfigRefresh = new UpdateRepositoryConfigurationAction() {
+			@Override
+			public void run() {
+				getTaskEditorPage().showEditorBusy(true);
+				final TaskJob job = TasksUiInternal.getJobFactory()
+						.createUpdateRepositoryConfigurationJob(
+								getTaskEditorPage().getConnector(),
+								getTaskEditorPage().getTaskRepository(),
+								getTaskEditorPage().getTask());
+				job.addJobChangeListener(new JobChangeAdapter() {
+					@Override
+					public void done(IJobChangeEvent event) {
+						PlatformUI.getWorkbench().getDisplay()
+								.asyncExec(new Runnable() {
+									public void run() {
+										getTaskEditorPage().showEditorBusy(
+												false);
+										if (job.getStatus() != null) {
+											getTaskEditorPage()
+													.getTaskEditor()
+													.setStatus(
+															Messages.TaskEditorAttributePart_Updating_of_repository_configuration_failed,
+															Messages.TaskEditorAttributePart_Update_Failed,
+															job.getStatus());
+										} else {
+											getTaskEditorPage().refresh();
+										}
+									}
+								});
+					}
+				});
+				job.setUser(true);
+				job.setProperty(WorkbenchUtil.SHOW_IN_TASKBAR_ICON_PROPERTY,
+						Boolean.TRUE);
+				job.setPriority(Job.INTERACTIVE);
+				job.schedule();
+			};
+
+		};
+		repositoryConfigRefresh
+				.setImageDescriptor(TasksUiImages.REPOSITORY_SYNCHRONIZE_SMALL);
+		repositoryConfigRefresh.selectionChanged(new StructuredSelection(
+				getTaskEditorPage().getTaskRepository()));
+		repositoryConfigRefresh
+				.setToolTipText(Messages.TaskEditorAttributePart_Refresh_Attributes);
+		toolBar.add(repositoryConfigRefresh);
+	}
+
+	private void initialize() {
+		attributeEditors = new ArrayList<AbstractAttributeEditor>();
+		hasIncoming = false;
+
+		TaskAttribute root = getTaskData().getRoot();
+		List<TaskAttribute> attributes = new LinkedList<TaskAttribute>();
+		TaskAttribute milestones = root
+				.getAttribute(IssueAttribute.MILESTONE.getId());
+		if (milestones != null)
+			attributes.add(milestones);
+
+		TaskAttribute labels = root.getAttribute(IssueAttribute.LABELS
+				.getId());
+		if (labels != null)
+			attributes.add(labels);
+
+		for (TaskAttribute attribute : attributes) {
+			AbstractAttributeEditor attributeEditor = createAttributeEditor(attribute);
+			if (attributeEditor != null) {
+				attributeEditors.add(attributeEditor);
+				if (getModel().hasIncomingChanges(attribute))
+					hasIncoming = true;
+			}
+		}
+	}
+
+	@Override
+	public boolean setFormInput(Object input) {
+		if (input instanceof String) {
+			String text = (String) input;
+			Map<String, TaskAttribute> attributes = getTaskData().getRoot()
+					.getAttributes();
+			for (TaskAttribute attribute : attributes.values())
+				if (text.equals(attribute.getId())) {
+					TaskAttributeMetaData properties = attribute.getMetaData();
+					if (TaskAttribute.KIND_DEFAULT.equals(properties.getKind()))
+						selectReveal(attribute);
+				}
+		}
+		return super.setFormInput(input);
+	}
+
+	public void selectReveal(TaskAttribute attribute) {
+		if (attribute == null)
+			return;
+
+		if (!getSection().isExpanded())
+			CommonFormUtil.setExpanded(getSection(), true);
+
+		EditorUtil.reveal(getTaskEditorPage().getManagedForm().getForm(),
+				attribute.getId());
+	}
+
+}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueConnectorUi.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueConnectorUi.java
new file mode 100644
index 00000000..d3fc3275
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueConnectorUi.java
@@ -0,0 +1,173 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     David Green <david.green@tasktop.com> - initial contribution
+ *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
+ *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.ui.issue;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.egit.github.core.Repository;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.jface.text.hyperlink.URLHyperlink;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.mylyn.internal.github.core.GitHub;
+import org.eclipse.mylyn.internal.github.core.issue.IssueConnector;
+import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
+import org.eclipse.mylyn.tasks.core.ITaskMapping;
+import org.eclipse.mylyn.tasks.core.TaskRepository;
+import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
+import org.eclipse.mylyn.tasks.ui.TaskHyperlink;
+import org.eclipse.mylyn.tasks.ui.TasksUi;
+import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage;
+import org.eclipse.mylyn.tasks.ui.wizards.ITaskRepositoryPage;
+import org.eclipse.mylyn.tasks.ui.wizards.ITaskSearchPage;
+import org.eclipse.mylyn.tasks.ui.wizards.NewTaskWizard;
+import org.eclipse.mylyn.tasks.ui.wizards.RepositoryQueryWizard;
+
+/**
+ * GitHub connector specific UI extensions.
+ */
+public class IssueConnectorUi extends AbstractRepositoryConnectorUi {
+
+	private final Pattern issuePattern = Pattern.compile("(?:([a-zA-Z0-9_\\.-]+)(?:/([a-zA-Z0-9_\\.-]+))?)?\\#(\\d+)");
+
+	/**
+	 * Get core repository connector
+	 * 
+	 * @return connector
+	 */
+	public static IssueConnector getCoreConnector() {
+		return (IssueConnector) TasksUi
+				.getRepositoryConnector(GitHub.CONNECTOR_KIND);
+	}
+
+	/**
+	 * 
+	 * 
+	 * @return the unique type of the repository: "github"
+	 */
+	@Override
+	public String getConnectorKind() {
+		return GitHub.CONNECTOR_KIND;
+	}
+
+	/**
+	 * 
+	 * 
+	 * @return {@link AbstractRepositorySettingsPage} with GitHub specific
+	 *         parameter like user name, password, ...
+	 */
+	@Override
+	public ITaskRepositoryPage getSettingsPage(
+			final TaskRepository taskRepository) {
+		return new IssueRepositorySettingsPage(taskRepository);
+	}
+
+	/**
+	 * 
+	 * 
+	 * @return {@link NewTaskWizard} with GitHub specific tab
+	 */
+	@Override
+	public IWizard getNewTaskWizard(final TaskRepository taskRepository,
+			final ITaskMapping taskSelection) {
+		return new NewTaskWizard(taskRepository, taskSelection);
+	}
+
+	/**
+	 * This {@link AbstractRepositoryConnectorUi} has search page.
+	 * 
+	 * @return {@code true}
+	 */
+	@Override
+	public boolean hasSearchPage() {
+		return true;
+	}
+
+	/**
+	 * Returns {@link IWizard} used in Mylyn for creating new queries. This
+	 * {@link IWizard} has a wizard page for creating GitHub specific task
+	 * queries.
+	 * 
+	 * @return {@link RepositoryQueryWizard} with GitHub specific query page
+	 */
+	@Override
+	public IWizard getQueryWizard(final TaskRepository taskRepository,
+			final IRepositoryQuery queryToEdit) {
+		RepositoryQueryWizard wizard = new RepositoryQueryWizard(taskRepository);
+		IssueRepositoryQueryPage queryPage = new IssueRepositoryQueryPage(
+				taskRepository, queryToEdit);
+		wizard.addPage(queryPage);
+		return wizard;
+	}
+	
+	
+	public IHyperlink[] findHyperlinks(TaskRepository repository, String text, int index, int textOffset) {
+		List<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
+		
+		Matcher matcher = issuePattern.matcher(text);
+		while (matcher.find()) {
+			if (index == -1 || (index >= matcher.start() && index <= matcher.end())) {
+				String user = matcher.group(1);
+				String project = matcher.group(2);
+				String taskId = matcher.group(3);
+				
+				if (project == null && user != null) {
+					// same project name, different user
+					String url = repository.getUrl();
+					Repository repo = GitHub.getRepository(url);
+					if (repo != null)
+						project = repo.getName();
+				}
+				
+				TaskRepository taskRepository = null;
+				if (user == null && project == null) { 
+					taskRepository = repository;
+				} else if (user != null && project != null) {
+					String repositoryUrl = GitHub.createGitHubUrl(user,project);
+					taskRepository = TasksUi.getRepositoryManager().getRepository(GitHub.CONNECTOR_KIND, repositoryUrl);
+					if (taskRepository == null) {
+						repositoryUrl = GitHub.createGitHubUrlAlternate(user,project);
+						taskRepository = TasksUi.getRepositoryManager().getRepository(GitHub.CONNECTOR_KIND, repositoryUrl);	
+					}
+				}
+				if (taskRepository != null) {
+					Region region = createRegion(textOffset, matcher);
+					hyperlinks.add(new TaskHyperlink(region, repository, taskId));
+				} else if (user != null && project != null) {
+					Region region = createRegion(textOffset, matcher);
+					String url = GitHub.createGitHubUrl(user, project)+"/issues/issue/"+taskId;
+					hyperlinks.add(new URLHyperlink(region, url));
+				}
+			}
+		}
+		return hyperlinks.toArray(new IHyperlink[hyperlinks.size()]);
+	}
+
+	private Region createRegion(int textOffset, Matcher matcher) {
+		return new Region(matcher.start()+textOffset,matcher.end()-matcher.start());
+	}
+
+	/**
+	 * @see org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi#getSearchPage(org.eclipse.mylyn.tasks.core.TaskRepository,
+	 *      org.eclipse.jface.viewers.IStructuredSelection)
+	 */
+	public ITaskSearchPage getSearchPage(TaskRepository repository,
+			IStructuredSelection selection) {
+		return new IssueRepositoryQueryPage(repository, null);
+	}
+
+}
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueLabelAttributeEditor.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueLabelAttributeEditor.java
new file mode 100644
index 00000000..da14cf1a
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueLabelAttributeEditor.java
@@ -0,0 +1,251 @@
+/*******************************************************************************
+ *  Copyright (c) 2011 GitHub Inc.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *    Kevin Sawicki (GitHub Inc.) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.ui.issue;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.window.Window;
+import org.eclipse.mylyn.github.ui.internal.GitHubImages;
+import org.eclipse.mylyn.internal.tasks.ui.notifications.TaskDiffUtil;
+import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
+import org.eclipse.mylyn.tasks.core.data.TaskDataModel;
+import org.eclipse.mylyn.tasks.ui.editors.AbstractAttributeEditor;
+import org.eclipse.mylyn.tasks.ui.editors.LayoutHint;
+import org.eclipse.mylyn.tasks.ui.editors.LayoutHint.ColumnSpan;
+import org.eclipse.mylyn.tasks.ui.editors.LayoutHint.RowSpan;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+/**
+ * Editor part for viewing an issue's labels.
+ */
+public class IssueLabelAttributeEditor extends AbstractAttributeEditor {
+
+	/**
+	 * LABEL_WIDTH
+	 */
+	public static final int LABEL_WIDTH = 80;
+
+	/**
+	 * LABEL_COLUMNS
+	 */
+	public static final int LABEL_COLUMNS = 12;
+
+	private class NewLabelAction extends Action {
+
+		public NewLabelAction() {
+			super(Messages.IssueLabelAttributeEditor_ActionNewLabel,
+					IAction.AS_PUSH_BUTTON);
+		}
+
+		public void run() {
+			InputDialog dialog = new InputDialog(getControl().getShell(),
+					Messages.IssueLabelAttributeEditor_TitleNewLabel,
+					Messages.IssueLabelAttributeEditor_DescriptionNewLabel,
+					"", new IInputValidator() { //$NON-NLS-1$
+
+						public String isValid(String newText) {
+							if (newText == null || newText.trim().length() == 0)
+								return Messages.IssueLabelAttributeEditor_MessageEnterName;
+							return null;
+						}
+					});
+			if (Window.OK == dialog.open()
+					&& !getTaskAttribute().getValues().contains(
+							dialog.getValue())) {
+				getTaskAttribute().addValue(dialog.getValue());
+				markLabelsChanged();
+				refreshLabels();
+			}
+		}
+
+	}
+
+	private class RemoveLabelAction extends Action {
+
+		private String label;
+
+		public RemoveLabelAction(String label) {
+			super(Messages.IssueLabelAttributeEditor_ActionRemoveLabel,
+					IAction.AS_PUSH_BUTTON);
+			this.label = label;
+		}
+
+		public void run() {
+			if (getTaskAttribute().getValues().contains(label)) {
+				getTaskAttribute().removeValue(label);
+				markLabelsChanged();
+				refreshLabels();
+			}
+		}
+
+	}
+
+	private class LabelAction extends Action {
+
+		public LabelAction(String label) {
+			super(label, IAction.AS_PUSH_BUTTON);
+			setImageDescriptor(GitHubImages.DESC_GITHUB_ISSUE_LABEL);
+		}
+
+		public void run() {
+			if (!getTaskAttribute().getValues().contains(getText())) {
+				getTaskAttribute().addValue(getText());
+				markLabelsChanged();
+				refreshLabels();
+			}
+		}
+	}
+
+	private Composite displayArea;
+	private boolean layout = false;
+	private Composite labelsArea;
+	private List<CLabel> labelControls = new LinkedList<CLabel>();
+	private FormToolkit toolkit;
+	private Comparator<String> labelComparator = new Comparator<String>() {
+
+		public int compare(String o1, String o2) {
+			return o1.compareToIgnoreCase(o2);
+		}
+	};
+
+	/**
+	 * @param manager
+	 * @param taskAttribute
+	 */
+	public IssueLabelAttributeEditor(TaskDataModel manager,
+			TaskAttribute taskAttribute) {
+		super(manager, taskAttribute);
+		setLayoutHint(new LayoutHint(RowSpan.SINGLE, ColumnSpan.MULTIPLE));
+	}
+
+	private void refreshLabels() {
+		for (CLabel labelControl : this.labelControls)
+			labelControl.dispose();
+		this.labelControls.clear();
+
+		Image labelImage = GitHubImages
+				.get(GitHubImages.GITHUB_ISSUE_LABEL_OBJ);
+		List<String> labels = new LinkedList<String>(getTaskAttribute()
+				.getValues());
+		Collections.sort(labels, this.labelComparator);
+		if (!labels.isEmpty())
+			for (final String label : labels) {
+				CLabel cLabel = new CLabel(labelsArea, SWT.NONE);
+				MenuManager manager = new MenuManager();
+				manager.setRemoveAllWhenShown(true);
+				manager.addMenuListener(new IMenuListener() {
+
+					public void menuAboutToShow(IMenuManager manager) {
+						manager.add(new RemoveLabelAction(label));
+					}
+				});
+				Menu menu = manager.createContextMenu(cLabel);
+				cLabel.setMenu(menu);
+				String shortened = TaskDiffUtil.shortenText(displayArea, label,
+						LABEL_WIDTH);
+				cLabel.setImage(labelImage);
+				cLabel.setText(shortened);
+				cLabel.setForeground(toolkit.getColors().getForeground());
+				if (!shortened.equals(label))
+					cLabel.setToolTipText(label);
+				this.labelControls.add(cLabel);
+			}
+		else
+			this.labelControls.add(new CLabel(labelsArea, SWT.NONE));
+
+		if (this.layout)
+			displayArea.getParent().getParent().layout(true, true);
+	}
+
+	private void markLabelsChanged() {
+		getModel().attributeChanged(getTaskAttribute());
+	}
+
+	/**
+	 * @see org.eclipse.mylyn.tasks.ui.editors.AbstractAttributeEditor#createControl(org.eclipse.swt.widgets.Composite,
+	 *      org.eclipse.ui.forms.widgets.FormToolkit)
+	 */
+	public void createControl(Composite parent, FormToolkit toolkit) {
+		this.toolkit = toolkit;
+		displayArea = toolkit.createComposite(parent);
+		displayArea.setBackgroundMode(SWT.INHERIT_FORCE);
+		GridDataFactory.fillDefaults().grab(true, true).applyTo(displayArea);
+		GridLayoutFactory.fillDefaults().numColumns(2).applyTo(displayArea);
+
+		final ToolBar toolbar = new ToolBar(displayArea, SWT.FLAT);
+		toolkit.adapt(toolbar, false, false);
+		final ToolItem addItem = new ToolItem(toolbar, SWT.DROP_DOWN);
+		addItem.setImage(GitHubImages.get(GitHubImages.GITHUB_ADD_OBJ));
+		addItem.setToolTipText(Messages.IssueLabelAttributeEditor_TooltipAddLabel);
+
+		MenuManager manager = new MenuManager();
+		manager.setRemoveAllWhenShown(true);
+		manager.addMenuListener(new IMenuListener() {
+
+			public void menuAboutToShow(IMenuManager manager) {
+				manager.add(new NewLabelAction());
+				manager.add(new Separator());
+				List<String> labels = new LinkedList<String>(getTaskAttribute()
+						.getOptions().values());
+				labels.removeAll(getTaskAttribute().getValues());
+				for (String label : labels)
+					manager.add(new LabelAction(label));
+				manager.update();
+			}
+		});
+		final Menu menu = manager.createContextMenu(displayArea);
+		addItem.addSelectionListener(new SelectionAdapter() {
+
+			public void widgetSelected(SelectionEvent e) {
+				Rectangle toolItemBounds = addItem.getBounds();
+				Point location = toolbar.toDisplay(toolItemBounds.x,
+						toolItemBounds.y + toolItemBounds.height);
+				menu.setLocation(location);
+				menu.setVisible(true);
+			}
+
+		});
+
+		labelsArea = toolkit.createComposite(displayArea);
+		labelsArea.setBackgroundMode(SWT.INHERIT_FORCE);
+		labelsArea.setBackground(null);
+		GridLayoutFactory.fillDefaults().numColumns(LABEL_COLUMNS)
+				.applyTo(labelsArea);
+		GridDataFactory.swtDefaults().grab(true, true).applyTo(labelsArea);
+		refreshLabels();
+		setControl(displayArea);
+		layout = true;
+	}
+}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositoryQueryPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositoryQueryPage.java
new file mode 100644
index 00000000..19cae0b0
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositoryQueryPage.java
@@ -0,0 +1,435 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     David Green <david.green@tasktop.com> - initial contribution
+ *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
+ *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.ui.issue;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.egit.github.core.Milestone;
+import org.eclipse.egit.github.core.service.IssueService;
+import org.eclipse.egit.github.core.util.LabelComparator;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.operation.IRunnableContext;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.mylyn.commons.net.Policy;
+import org.eclipse.mylyn.github.ui.internal.GitHubImages;
+import org.eclipse.mylyn.internal.github.core.QueryUtils;
+import org.eclipse.mylyn.internal.github.core.issue.IssueConnector;
+import org.eclipse.mylyn.internal.provisional.commons.ui.CommonUiUtil;
+import org.eclipse.mylyn.internal.provisional.commons.ui.ICoreRunnable;
+import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
+import org.eclipse.mylyn.tasks.core.TaskRepository;
+import org.eclipse.mylyn.tasks.ui.TasksUiImages;
+import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * GitHub issue repository query page class.
+ */
+public class IssueRepositoryQueryPage extends AbstractRepositoryQueryPage {
+
+	private Button openButton;
+	private Button closedButton;
+	private Text titleText;
+	private Text assigneeText;
+	private Text mentionText;
+	private Combo milestoneCombo;
+	private CheckboxTableViewer labelsViewer;
+	private List<Milestone> milestones;
+
+	private SelectionListener completeListener = new SelectionAdapter() {
+
+		public void widgetSelected(SelectionEvent e) {
+			setPageComplete(isPageComplete());
+		}
+
+	};
+
+	/**
+	 * @param pageName
+	 * @param taskRepository
+	 * @param query
+	 */
+	public IssueRepositoryQueryPage(String pageName,
+			TaskRepository taskRepository, IRepositoryQuery query) {
+		super(pageName, taskRepository, query);
+		setDescription(Messages.IssueRepositoryQueryPage_Description);
+		setPageComplete(false);
+	}
+
+	/**
+	 * @param taskRepository
+	 * @param query
+	 */
+	public IssueRepositoryQueryPage(TaskRepository taskRepository,
+			IRepositoryQuery query) {
+		this("issueQueryPage", taskRepository, query); //$NON-NLS-1$
+	}
+
+	private void createLabelsArea(Composite parent) {
+		Group labelsArea = new Group(parent, SWT.NONE);
+		labelsArea.setText(Messages.IssueRepositoryQueryPage_LabelsLabel);
+		GridDataFactory.fillDefaults().grab(true, true).applyTo(labelsArea);
+		GridLayoutFactory.swtDefaults().applyTo(labelsArea);
+
+		labelsViewer = CheckboxTableViewer.newCheckList(labelsArea, SWT.BORDER
+				| SWT.V_SCROLL | SWT.H_SCROLL);
+		GridDataFactory.fillDefaults().grab(true, true).hint(100, 80)
+				.applyTo(labelsViewer.getControl());
+		labelsViewer.setContentProvider(ArrayContentProvider.getInstance());
+		labelsViewer.setLabelProvider(new LabelProvider() {
+
+			public Image getImage(Object element) {
+				return GitHubImages.get(GitHubImages.GITHUB_ISSUE_LABEL_OBJ);
+			}
+
+		});
+		labelsViewer
+				.addSelectionChangedListener(new ISelectionChangedListener() {
+
+					public void selectionChanged(SelectionChangedEvent event) {
+						setPageComplete(isPageComplete());
+					}
+				});
+	}
+
+	private void createOptionsArea(Composite parent) {
+		Composite optionsArea = new Composite(parent, SWT.NONE);
+		GridLayoutFactory.fillDefaults().numColumns(2).applyTo(optionsArea);
+		GridDataFactory.fillDefaults().grab(true, true).applyTo(optionsArea);
+
+		Composite statusArea = new Composite(optionsArea, SWT.NONE);
+		GridLayoutFactory.fillDefaults().numColumns(4).equalWidth(false)
+				.applyTo(statusArea);
+		GridDataFactory.fillDefaults().grab(true, false).span(2, 1)
+				.applyTo(statusArea);
+
+		new Label(statusArea, SWT.NONE)
+				.setText(Messages.IssueRepositoryQueryPage_StatusLabel);
+
+		openButton = new Button(statusArea, SWT.CHECK);
+		openButton.setSelection(true);
+		openButton.setText(Messages.IssueRepositoryQueryPage_StatusOpen);
+		openButton.addSelectionListener(this.completeListener);
+
+		closedButton = new Button(statusArea, SWT.CHECK);
+		closedButton.setSelection(true);
+		closedButton.setText(Messages.IssueRepositoryQueryPage_StatusClosed);
+		closedButton.addSelectionListener(this.completeListener);
+
+		ToolBar toolbar = new ToolBar(statusArea, SWT.FLAT);
+		ToolItem updateItem = new ToolItem(toolbar, SWT.PUSH);
+		final Image updateImage = TasksUiImages.REPOSITORY_UPDATE_CONFIGURATION
+				.createImage();
+		toolbar.addDisposeListener(new DisposeListener() {
+
+			public void widgetDisposed(DisposeEvent e) {
+				updateImage.dispose();
+			}
+		});
+		updateItem.setImage(updateImage);
+		updateItem
+				.setToolTipText(Messages.IssueRepositoryQueryPage_TooltipUpdateRepository);
+		GridDataFactory.fillDefaults().align(SWT.END, SWT.FILL)
+				.grab(true, false).applyTo(toolbar);
+		updateItem.addSelectionListener(new SelectionAdapter() {
+
+			public void widgetSelected(SelectionEvent e) {
+				refreshRepository();
+			}
+
+		});
+
+		Label milestonesLabel = new Label(optionsArea, SWT.NONE);
+		milestonesLabel
+				.setText(Messages.IssueRepositoryQueryPage_MilestoneLabel);
+
+		milestoneCombo = new Combo(optionsArea, SWT.DROP_DOWN | SWT.READ_ONLY);
+		GridDataFactory.fillDefaults().grab(true, false)
+				.applyTo(milestoneCombo);
+
+		Label assigneeLabel = new Label(optionsArea, SWT.NONE);
+		assigneeLabel.setText(Messages.IssueRepositoryQueryPage_AssigneeLabel);
+
+		assigneeText = new Text(optionsArea, SWT.BORDER | SWT.SINGLE);
+		GridDataFactory.fillDefaults().grab(true, false).applyTo(assigneeText);
+
+		Label mentionLabel = new Label(optionsArea, SWT.NONE);
+		mentionLabel.setText(Messages.IssueRepositoryQueryPage_MentionsLabel);
+
+		mentionText = new Text(optionsArea, SWT.BORDER | SWT.SINGLE);
+		GridDataFactory.fillDefaults().grab(true, false).applyTo(mentionText);
+
+	}
+
+	/**
+	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+	 */
+	public void createControl(Composite parent) {
+		Composite displayArea = new Composite(parent, SWT.NONE);
+		GridLayoutFactory.fillDefaults().numColumns(2).equalWidth(true)
+				.applyTo(displayArea);
+		GridDataFactory.fillDefaults().grab(true, true).applyTo(displayArea);
+
+		if (!inSearchContainer()) {
+			Composite titleArea = new Composite(displayArea, SWT.NONE);
+			GridLayoutFactory.fillDefaults().numColumns(2).applyTo(titleArea);
+			GridDataFactory.fillDefaults().grab(true, false).span(2, 1)
+					.applyTo(titleArea);
+
+			new Label(titleArea, SWT.NONE)
+					.setText(Messages.IssueRepositoryQueryPage_TitleLabel);
+			titleText = new Text(titleArea, SWT.SINGLE | SWT.BORDER);
+			GridDataFactory.fillDefaults().grab(true, false).applyTo(titleText);
+			titleText.addModifyListener(new ModifyListener() {
+
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(isPageComplete());
+				}
+			});
+		}
+
+		createOptionsArea(displayArea);
+
+		createLabelsArea(displayArea);
+
+		loadRepository();
+
+		initialize();
+		setControl(displayArea);
+	}
+
+	private void initialize() {
+		IRepositoryQuery query = getQuery();
+		if (query == null)
+			return;
+
+		String milestoneNumber = query
+				.getAttribute(IssueService.FILTER_MILESTONE);
+		if (milestoneNumber != null && this.milestones != null) {
+			int index = 0;
+			for (Milestone milestone : this.milestones) {
+				index++;
+				if (milestoneNumber.equals(Integer.toString(milestone
+						.getNumber()))) {
+					this.milestoneCombo.select(index);
+					break;
+				}
+			}
+		}
+
+		titleText.setText(query.getSummary());
+		labelsViewer.setCheckedElements(QueryUtils.getAttributes(
+				IssueService.FILTER_LABELS, query).toArray());
+		List<String> status = QueryUtils.getAttributes(
+				IssueService.FILTER_STATE, query);
+		closedButton.setSelection(status.contains(IssueService.STATE_CLOSED));
+		openButton.setSelection(status.contains(IssueService.STATE_OPEN));
+
+		String assignee = query.getAttribute(IssueService.FILTER_ASSIGNEE);
+		if (assignee != null)
+			assigneeText.setText(assignee);
+
+		String mentioning = query.getAttribute(IssueService.FILTER_MENTIONED);
+		if (mentioning != null)
+			mentionText.setText(mentioning);
+	}
+
+	private boolean updateLabels() {
+		if (this.labelsViewer.getControl().isDisposed())
+			return false;
+
+		IssueConnector connector = IssueConnectorUi.getCoreConnector();
+		TaskRepository repository = getTaskRepository();
+		boolean hasLabels = connector.hasCachedLabels(repository);
+		if (hasLabels) {
+			List<org.eclipse.egit.github.core.Label> labels = connector
+					.getLabels(repository);
+			Collections.sort(labels, new LabelComparator());
+			List<String> labelNames = new ArrayList<String>(labels.size());
+			for (org.eclipse.egit.github.core.Label label : labels)
+				labelNames.add(label.getName());
+			this.labelsViewer.setInput(labelNames);
+		}
+		return hasLabels;
+	}
+
+	private boolean updateMilestones() {
+		if (this.milestoneCombo.isDisposed())
+			return false;
+
+		IssueConnector connector = IssueConnectorUi.getCoreConnector();
+		TaskRepository repository = getTaskRepository();
+		boolean hasMilestones = connector.hasCachedMilestones(repository);
+		if (hasMilestones) {
+			this.milestones = connector.getMilestones(repository);
+			this.milestoneCombo.removeAll();
+			this.milestoneCombo
+					.add(Messages.IssueRepositoryQueryPage_MilestoneNone);
+			Collections.sort(this.milestones, new Comparator<Milestone>() {
+
+				public int compare(Milestone m1, Milestone m2) {
+					return m1.getTitle().compareToIgnoreCase(m2.getTitle());
+				}
+			});
+			for (Milestone milestone : milestones)
+				this.milestoneCombo.add(milestone.getTitle());
+
+			this.milestoneCombo.select(0);
+		}
+		return hasMilestones;
+	}
+
+	private void refreshRepository() {
+		try {
+			ICoreRunnable runnable = new ICoreRunnable() {
+
+				public void run(IProgressMonitor monitor) throws CoreException {
+					Policy.monitorFor(monitor);
+					monitor.beginTask("", 2); //$NON-NLS-1$
+					IssueConnector connector = IssueConnectorUi
+							.getCoreConnector();
+					TaskRepository repository = getTaskRepository();
+
+					monitor.setTaskName(Messages.IssueRepositoryQueryPage_TaskLoadingLabels);
+					connector.refreshLabels(repository);
+					monitor.worked(1);
+
+					monitor.setTaskName(Messages.IssueRepositoryQueryPage_TaskLoadingMilestones);
+					connector.refreshMilestones(repository);
+					monitor.done();
+
+					PlatformUI.getWorkbench().getDisplay()
+							.asyncExec(new Runnable() {
+
+								public void run() {
+									updateLabels();
+									updateMilestones();
+									initialize();
+								}
+							});
+				}
+			};
+			IRunnableContext context = getContainer();
+			if (context == null)
+				if (inSearchContainer())
+					context = getSearchContainer().getRunnableContext();
+				else
+					context = PlatformUI.getWorkbench().getProgressService();
+			CommonUiUtil.run(context, runnable);
+		} catch (CoreException e) {
+			IStatus status = e.getStatus();
+			ErrorDialog.openError(getShell(),
+					Messages.IssueRepositoryQueryPage_ErrorLoading,
+					e.getLocalizedMessage(), status);
+		}
+	}
+
+	private void loadRepository() {
+		boolean labelsLoaded = updateLabels();
+		boolean milestonesLoaded = updateMilestones();
+		if (!labelsLoaded || !milestonesLoaded)
+			refreshRepository();
+	}
+
+	/**
+	 * @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage#isPageComplete()
+	 */
+	public boolean isPageComplete() {
+		boolean complete = super.isPageComplete();
+		if (complete) {
+			String message = null;
+			if (!openButton.getSelection() && !closedButton.getSelection())
+				message = Messages.IssueRepositoryQueryPage_ErrorStatus;
+
+			setErrorMessage(message);
+			complete = message == null;
+		}
+		return complete;
+	}
+
+	/**
+	 * @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage#getQueryTitle()
+	 */
+	public String getQueryTitle() {
+		return this.titleText != null ? this.titleText.getText() : null;
+	}
+
+	/**
+	 * @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage#applyTo(org.eclipse.mylyn.tasks.core.IRepositoryQuery)
+	 */
+	public void applyTo(IRepositoryQuery query) {
+		query.setSummary(getQueryTitle());
+
+		List<String> statuses = new LinkedList<String>();
+		if (openButton.getSelection())
+			statuses.add(IssueService.STATE_OPEN);
+		if (closedButton.getSelection())
+			statuses.add(IssueService.STATE_CLOSED);
+		QueryUtils.setAttribute(IssueService.FILTER_STATE, statuses, query);
+
+		String assignee = this.assigneeText.getText().trim();
+		if (assignee.length() > 0)
+			query.setAttribute(IssueService.FILTER_ASSIGNEE, assignee);
+		else
+			query.setAttribute(IssueService.FILTER_ASSIGNEE, null);
+
+		String mentions = this.mentionText.getText().trim();
+		if (mentions.length() > 0)
+			query.setAttribute(IssueService.FILTER_MENTIONED, mentions);
+		else
+			query.setAttribute(IssueService.FILTER_MENTIONED, null);
+
+		int milestoneSelected = this.milestoneCombo.getSelectionIndex() - 1;
+		if (milestoneSelected >= 0)
+			query.setAttribute(IssueService.FILTER_MILESTONE, Integer
+					.toString(this.milestones.get(milestoneSelected)
+							.getNumber()));
+		else
+			query.setAttribute(IssueService.FILTER_MILESTONE, null);
+
+		List<String> labels = new LinkedList<String>();
+		for (Object label : labelsViewer.getCheckedElements())
+			labels.add(label.toString());
+		QueryUtils.setAttribute(IssueService.FILTER_LABELS, labels, query);
+	}
+}
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositorySettingsPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositorySettingsPage.java
new file mode 100644
index 00000000..3f3a27bd
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositorySettingsPage.java
@@ -0,0 +1,204 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     David Green <david.green@tasktop.com> - initial contribution
+ *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
+ *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.ui.issue;
+
+import java.io.IOException;
+import java.net.URL;
+import java.text.MessageFormat;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.egit.github.core.Repository;
+import org.eclipse.egit.github.core.client.GitHubClient;
+import org.eclipse.egit.github.core.service.IssueService;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
+import org.eclipse.mylyn.commons.net.AuthenticationType;
+import org.eclipse.mylyn.github.ui.internal.GitHubUi;
+import org.eclipse.mylyn.internal.github.core.GitHub;
+import org.eclipse.mylyn.internal.tasks.core.IRepositoryConstants;
+import org.eclipse.mylyn.tasks.core.TaskRepository;
+import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * GitHub connector specific extensions.
+ */
+public class IssueRepositorySettingsPage extends AbstractRepositorySettingsPage {
+
+	/**
+	 * URL
+	 */
+	public static final String URL = "http://github.com"; //$NON-NLS-1$
+
+	/**
+	 * DEFAULT_REPOSITORY
+	 */
+	public static final String DEFAULT_REPOSITORY = "/user/repository"; //$NON-NLS-1$
+
+	private boolean syncLabel = true;
+	private boolean editingUrl = false;
+
+	/**
+	 * Populate taskRepository with repository settings.
+	 * 
+	 * @param taskRepository
+	 *            - Object to populate
+	 */
+	public IssueRepositorySettingsPage(final TaskRepository taskRepository) {
+		super(Messages.IssueRepositorySettingsPage_Title,
+				Messages.IssueRepositorySettingsPage_Description,
+				taskRepository);
+		this.setHttpAuth(false);
+		this.setNeedsAdvanced(false);
+		this.setNeedsAnonymousLogin(true);
+		this.setNeedsTimeZone(false);
+		this.setNeedsHttpAuth(false);
+	}
+
+	@Override
+	public String getConnectorKind() {
+		return GitHub.CONNECTOR_KIND;
+	}
+
+	/**
+	 * Sync server url combo with repository label editor base on default label
+	 * format
+	 */
+	protected void syncRepositoryLabel() {
+		if (syncLabel) {
+			String url = serverUrlCombo.getText();
+			Repository repo = GitHub.getRepository(url);
+			if (repo != null)
+				repositoryLabelEditor.setStringValue(repo.getOwner() + '/'
+						+ repo.getName());
+		}
+	}
+
+	@Override
+	protected void createAdditionalControls(Composite parent) {
+		// Set the URL now, because serverURL is definitely instantiated .
+		if (serverUrlCombo.getText().length() == 0) {
+			String fullUrlText = URL + DEFAULT_REPOSITORY;
+			serverUrlCombo.setText(fullUrlText);
+			serverUrlCombo.setFocus();
+			// select the user/project part of the URL so that the user can just
+			// start typing to replace the text.
+			serverUrlCombo.setSelection(new Point(URL.length() + 1, fullUrlText
+					.length()));
+
+			syncRepositoryLabel();
+
+			serverUrlCombo.addModifyListener(new ModifyListener() {
+
+				public void modifyText(ModifyEvent e) {
+					editingUrl = true;
+					try {
+						syncRepositoryLabel();
+					} finally {
+						editingUrl = false;
+					}
+				}
+			});
+
+			repositoryLabelEditor.getTextControl(compositeContainer)
+					.addModifyListener(new ModifyListener() {
+
+						public void modifyText(ModifyEvent e) {
+							if (!editingUrl)
+								syncLabel = false;
+						}
+					});
+		}
+
+		if (getRepository() == null)
+			setAnonymous(false);
+	}
+
+	@Override
+	protected Validator getValidator(final TaskRepository repository) {
+		Validator validator = new Validator() {
+			@Override
+			public void run(IProgressMonitor monitor) throws CoreException {
+				monitor.beginTask(
+						Messages.IssueRepositorySettingsPage_TaskValidating,
+						100);
+				try {
+					monitor.subTask(Messages.IssueRepositorySettingsPage_TaskContactingServer);
+					try {
+						AuthenticationCredentials auth = repository
+								.getCredentials(AuthenticationType.REPOSITORY);
+						GitHubClient client = new GitHubClient();
+						if (auth != null)
+							client.setCredentials(auth.getUserName(),
+									auth.getPassword());
+						IssueService service = new IssueService(client);
+						Repository repo = GitHub.getRepository(repository
+								.getRepositoryUrl());
+						monitor.worked(50);
+						service.getIssues(repo.getOwner(), repo.getName(), null);
+					} catch (IOException e) {
+						String message = MessageFormat
+								.format(Messages.IssueRepositorySettingsPage_StatusError,
+										e.getLocalizedMessage());
+						setStatus(GitHubUi.createErrorStatus(message));
+						return;
+					} finally {
+						monitor.done();
+					}
+
+					setStatus(new Status(IStatus.OK, GitHubUi.BUNDLE_ID,
+							Messages.IssueRepositorySettingsPage_StatusSuccess));
+				} finally {
+					monitor.done();
+				}
+			}
+		};
+		return validator;
+	}
+
+	@Override
+	protected boolean isValidUrl(final String url) {
+		if (url.startsWith("http://") || url.startsWith("https://")) //$NON-NLS-1$ //$NON-NLS-2$
+			try {
+				new URL(url);
+				return GitHub.getRepository(url) != null;
+			} catch (IOException e) {
+				return false;
+			}
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage#applyTo(org.eclipse.mylyn.tasks.core.TaskRepository)
+	 */
+	public void applyTo(TaskRepository repository) {
+		repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY,
+				IRepositoryConstants.CATEGORY_BUGS);
+		super.applyTo(repository);
+	}
+
+	/**
+	 * @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage#canValidate()
+	 */
+	public boolean canValidate() {
+		return isPageComplete()
+				&& (getMessage() == null || getMessageType() != IMessageProvider.ERROR);
+	}
+
+}
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueSummaryPart.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueSummaryPart.java
new file mode 100644
index 00000000..7a9e0b8b
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueSummaryPart.java
@@ -0,0 +1,237 @@
+/*******************************************************************************
+ *  Copyright (c) 2011 GitHub Inc.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *    Kevin Sawicki (GitHub Inc.) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.ui.issue;
+
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.mylyn.github.ui.internal.AvatarLabel;
+import org.eclipse.mylyn.github.ui.internal.GitHubUi;
+import org.eclipse.mylyn.internal.github.core.issue.IssueAttribute;
+import org.eclipse.mylyn.internal.tasks.ui.editors.DateAttributeEditor;
+import org.eclipse.mylyn.internal.tasks.ui.editors.EditorUtil;
+import org.eclipse.mylyn.internal.tasks.ui.editors.RichTextAttributeEditor;
+import org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorSummaryPart;
+import org.eclipse.mylyn.tasks.core.IRepositoryPerson;
+import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
+import org.eclipse.mylyn.tasks.ui.editors.AbstractAttributeEditor;
+import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPart;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+/**
+ * Issue summary task editor part modeled after {@link TaskEditorSummaryPart}
+ * but displaying reporter and assignee avatar images.
+ */
+public class IssueSummaryPart extends AbstractTaskEditorPart {
+
+	/**
+	 * AVATAR_SIZE
+	 */
+	public static final int AVATAR_SIZE = 48;
+
+	private AbstractAttributeEditor summaryEditor;
+
+	private String reporterAvatarId;
+
+	private String assigneeAvatarId;
+
+	/**
+	 * Create issue summary part
+	 * 
+	 * @param reporterAvatarId
+	 * @param assigneeAvatarId
+	 */
+	public IssueSummaryPart(String reporterAvatarId, String assigneeAvatarId) {
+		setPartName("Summary"); //$NON-NLS-1$
+		this.reporterAvatarId = reporterAvatarId;
+		this.assigneeAvatarId = assigneeAvatarId;
+	}
+
+	private void addAttribute(Composite composite, FormToolkit toolkit,
+			TaskAttribute attribute) {
+		addAttribute(composite, toolkit, attribute,
+				EditorUtil.HEADER_COLUMN_MARGIN);
+	}
+
+	private void addAttribute(Composite composite, FormToolkit toolkit,
+			TaskAttribute attribute, int indent) {
+		addAttribute(composite, toolkit, attribute, indent, true);
+	}
+
+	private void addAttribute(Composite composite, FormToolkit toolkit,
+			TaskAttribute attribute, int indent, boolean showLabel) {
+		AbstractAttributeEditor editor = createAttributeEditor(attribute);
+		if (editor == null)
+			return;
+
+		editor.setReadOnly(true);
+		editor.setDecorationEnabled(false);
+
+		if (showLabel) {
+			editor.createLabelControl(composite, toolkit);
+			GridDataFactory.defaultsFor(editor.getLabelControl())
+					.indent(indent, 0).applyTo(editor.getLabelControl());
+		}
+
+		if (isAttribute(attribute, TaskAttribute.DATE_MODIFICATION)
+				&& editor instanceof DateAttributeEditor)
+			((DateAttributeEditor) editor).setShowTime(true);
+
+		editor.createControl(composite, toolkit);
+		getTaskEditorPage().getAttributeEditorToolkit().adapt(editor);
+	}
+
+	private boolean isAttribute(TaskAttribute attribute, String id) {
+		return attribute
+				.getId()
+				.equals(attribute.getTaskData().getAttributeMapper()
+						.mapToRepositoryKey(attribute.getParentAttribute(), id));
+	}
+
+	private void addSummaryText(Composite composite, final FormToolkit toolkit) {
+		TaskAttribute summaryAttrib = getTaskData().getRoot()
+				.getMappedAttribute(TaskAttribute.SUMMARY);
+		summaryEditor = createAttributeEditor(summaryAttrib);
+		if (summaryEditor == null)
+			return;
+
+		if (summaryAttrib.getMetaData().isReadOnly())
+			summaryEditor.setReadOnly(true);
+
+		if (summaryEditor instanceof RichTextAttributeEditor) {
+			Composite roundedBorder = EditorUtil.createBorder(composite,
+					toolkit, !summaryEditor.isReadOnly());
+			summaryEditor.createControl(roundedBorder, toolkit);
+			EditorUtil.setHeaderFontSizeAndStyle(summaryEditor.getControl());
+		} else {
+			final Composite border = toolkit.createComposite(composite);
+			GridDataFactory.fillDefaults().align(SWT.FILL, SWT.BEGINNING)
+					.hint(EditorUtil.MAXIMUM_WIDTH, SWT.DEFAULT)
+					.grab(true, false).applyTo(border);
+			GridLayoutFactory.fillDefaults().margins(1, 4).applyTo(border);
+			summaryEditor.createControl(border, toolkit);
+			GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
+					.grab(true, false).applyTo(summaryEditor.getControl());
+			toolkit.paintBordersFor(border);
+		}
+		getTaskEditorPage().getAttributeEditorToolkit().adapt(summaryEditor);
+	}
+
+	private TaskAttribute getAttribute(IssueAttribute attribute) {
+		return getAttribute(attribute.getId());
+	}
+
+	private TaskAttribute getAttribute(String id) {
+		return getTaskData().getRoot().getAttribute(id);
+	}
+
+	private boolean addAvatarPart(Composite parent, FormToolkit toolkit,
+			TaskAttribute avatarAttribute, IRepositoryPerson person) {
+		if (avatarAttribute == null || avatarAttribute.getValue().length() == 0)
+			return false;
+
+		AvatarLabel label = new AvatarLabel(GitHubUi.getDefault().getStore(),
+				person, avatarAttribute);
+		label.create(parent, toolkit);
+		return true;
+	}
+
+	/**
+	 * Create control
+	 * 
+	 * @param parent
+	 * @param toolkit
+	 */
+	public void createControl(Composite parent, FormToolkit toolkit) {
+		Composite composite = toolkit.createComposite(parent);
+		GridLayout layout = EditorUtil.createSectionClientLayout();
+		layout.numColumns = 1;
+		layout.marginHeight = 0;
+		layout.marginTop = 0;
+		layout.marginWidth = 0;
+		layout.verticalSpacing = 3;
+		composite.setLayout(layout);
+
+		TaskAttribute reporter = getAttribute(IssueAttribute.REPORTER);
+		if (reporter != null) {
+			IRepositoryPerson person = getTaskData().getAttributeMapper()
+					.getRepositoryPerson(reporter);
+			if (this.reporterAvatarId != null
+					&& addAvatarPart(composite, toolkit,
+							getAttribute(this.reporterAvatarId), person))
+				layout.numColumns++;
+		}
+		addSummaryText(composite, toolkit);
+
+		TaskAttribute assignee = getAttribute(IssueAttribute.ASSIGNEE);
+		if (assignee != null) {
+			IRepositoryPerson person = getTaskData().getAttributeMapper()
+					.getRepositoryPerson(assignee);
+			if (this.assigneeAvatarId != null
+					&& addAvatarPart(composite, toolkit,
+							getAttribute(this.assigneeAvatarId), person))
+				layout.numColumns++;
+		}
+
+		if (needsHeader())
+			createHeaderLayout(composite, toolkit);
+
+		toolkit.paintBordersFor(composite);
+		setControl(composite);
+	}
+
+	private Composite createHeaderLayout(Composite composite,
+			FormToolkit toolkit) {
+		Composite headerComposite = toolkit.createComposite(composite);
+		GridLayout layout = new GridLayout(1, false);
+		layout.verticalSpacing = 1;
+		layout.marginHeight = 0;
+		layout.marginWidth = 0;
+		headerComposite.setLayout(layout);
+		GridDataFactory.fillDefaults().grab(true, false)
+				.applyTo(headerComposite);
+
+		TaskAttribute root = getTaskData().getRoot();
+
+		addAttribute(headerComposite, toolkit,
+				root.getMappedAttribute(TaskAttribute.STATUS), 0);
+
+		addAttribute(headerComposite, toolkit,
+				root.getMappedAttribute(TaskAttribute.DATE_CREATION));
+
+		addAttribute(headerComposite, toolkit,
+				root.getMappedAttribute(TaskAttribute.DATE_MODIFICATION));
+
+		// ensure layout does not wrap
+		layout.numColumns = headerComposite.getChildren().length;
+
+		// ensure that the composite does not show a bunch of blank space
+		if (layout.numColumns == 0) {
+			layout.numColumns = 1;
+			toolkit.createLabel(headerComposite, " "); //$NON-NLS-1$
+		}
+		return headerComposite;
+	}
+
+	private boolean needsHeader() {
+		return !getTaskData().isNew();
+	}
+
+	/**
+	 * @see org.eclipse.ui.forms.AbstractFormPart#setFocus()
+	 */
+	public void setFocus() {
+		if (summaryEditor != null)
+			summaryEditor.getControl().setFocus();
+	}
+}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueTaskEditorPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueTaskEditorPage.java
new file mode 100644
index 00000000..0641a25b
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueTaskEditorPage.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     David Green <david.green@tasktop.com> - initial contribution
+ *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
+ *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.ui.issue;
+
+import java.util.Iterator;
+import java.util.Set;
+
+import org.eclipse.mylyn.internal.github.core.GitHub;
+import org.eclipse.mylyn.internal.github.core.issue.IssueAttribute;
+import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPage;
+import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPart;
+import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
+import org.eclipse.mylyn.tasks.ui.editors.TaskEditorPartDescriptor;
+
+/**
+ * Editor page for GitHub.
+ */
+public class IssueTaskEditorPage extends AbstractTaskEditorPage {
+
+	/**
+	 * Constructor for the GitHubTaskEditorPage
+	 * 
+	 * @param editor
+	 *            The task editor to create for GitHub
+	 */
+	public IssueTaskEditorPage(final TaskEditor editor) {
+		super(editor, GitHub.CONNECTOR_KIND);
+		setNeedsPrivateSection(true);
+		setNeedsSubmitButton(true);
+	}
+
+	@Override
+	protected Set<TaskEditorPartDescriptor> createPartDescriptors() {
+		Set<TaskEditorPartDescriptor> partDescriptors = super
+				.createPartDescriptors();
+		Iterator<TaskEditorPartDescriptor> descriptorIt = partDescriptors
+				.iterator();
+		while (descriptorIt.hasNext()) {
+			TaskEditorPartDescriptor partDescriptor = descriptorIt.next();
+			String id = partDescriptor.getId();
+			if (id.equals(ID_PART_ATTRIBUTES) || id.equals(ID_PART_SUMMARY))
+				descriptorIt.remove();
+		}
+		partDescriptors.add(new TaskEditorPartDescriptor(ID_PART_SUMMARY) {
+
+			public AbstractTaskEditorPart createPart() {
+				return new IssueSummaryPart(
+						IssueAttribute.REPORTER_GRAVATAR.getId(),
+						IssueAttribute.ASSIGNEE_GRAVATAR.getId());
+			}
+		}.setPath(PATH_HEADER));
+		partDescriptors.add(new TaskEditorPartDescriptor(ID_PART_ATTRIBUTES) {
+
+			public AbstractTaskEditorPart createPart() {
+				return new IssueAttributePart();
+			}
+		}.setPath(PATH_ATTRIBUTES));
+		return partDescriptors;
+	}
+
+}
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueTaskEditorPageFactory.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueTaskEditorPageFactory.java
new file mode 100644
index 00000000..cb822a23
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueTaskEditorPageFactory.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     David Green <david.green@tasktop.com> - initial contribution
+ *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
+ *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.ui.issue;
+
+import org.eclipse.mylyn.github.ui.internal.GitHubImages;
+import org.eclipse.mylyn.internal.github.core.GitHub;
+import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.ui.ITasksUiConstants;
+import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
+import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPageFactory;
+import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
+import org.eclipse.mylyn.tasks.ui.editors.TaskEditorInput;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.forms.editor.IFormPage;
+
+/**
+ * Editor page factory for GitHub.
+ */
+public class IssueTaskEditorPageFactory extends AbstractTaskEditorPageFactory {
+
+	@Override
+	public boolean canCreatePageFor(TaskEditorInput input) {
+		ITask task = input.getTask();
+		return GitHub.CONNECTOR_KIND.equals(task.getConnectorKind())
+				|| TasksUiUtil.isOutgoingNewTask(task, GitHub.CONNECTOR_KIND);
+	}
+
+	@Override
+	public Image getPageImage() {
+		return GitHubImages.get(GitHubImages.GITHUB_LOGO_OBJ);
+	}
+
+	@Override
+	public String getPageText() {
+		return Messages.IssueTaskEditorPageFactory_PageText;
+	}
+
+	@Override
+	public int getPriority() {
+		return PRIORITY_TASK;
+	}
+
+	@Override
+	public IFormPage createPage(TaskEditor parentEditor) {
+		return new IssueTaskEditorPage(parentEditor);
+	}
+
+	@Override
+	public String[] getConflictingIds(TaskEditorInput input) {
+		return new String[] { ITasksUiConstants.ID_PAGE_PLANNING };
+	}
+
+}
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/Messages.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/Messages.java
new file mode 100644
index 00000000..f1ef114d
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/Messages.java
@@ -0,0 +1,113 @@
+/*******************************************************************************
+ *  Copyright (c) 2011 GitHub Inc.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *    Kevin Sawicki (GitHub Inc.) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.ui.issue;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * NLS
+ */
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.github.ui.issue.messages"; //$NON-NLS-1$
+
+	/** */
+	public static String IssueRepositoryQueryPage_ErrorLoading;
+
+	/** */
+	public static String IssueRepositoryQueryPage_AssigneeLabel;
+
+	/** */
+	public static String IssueRepositoryQueryPage_Description;
+
+	/** */
+	public static String IssueRepositoryQueryPage_ErrorStatus;
+
+	/** */
+	public static String IssueRepositoryQueryPage_LabelsLabel;
+
+	/** */
+	public static String IssueRepositoryQueryPage_MentionsLabel;
+
+	/** */
+	public static String IssueRepositoryQueryPage_MilestoneLabel;
+
+	/** */
+	public static String IssueRepositoryQueryPage_MilestoneNone;
+
+	/** */
+	public static String IssueRepositoryQueryPage_StatusClosed;
+
+	/** */
+	public static String IssueRepositoryQueryPage_StatusLabel;
+
+	/** */
+	public static String IssueRepositoryQueryPage_StatusOpen;
+
+	/** */
+	public static String IssueRepositoryQueryPage_TaskLoadingLabels;
+
+	/** */
+	public static String IssueRepositoryQueryPage_TaskLoadingMilestones;
+
+	/** */
+	public static String IssueRepositoryQueryPage_TitleLabel;
+
+	/** */
+	public static String IssueRepositoryQueryPage_TooltipUpdateRepository;
+
+	/** */
+	public static String IssueRepositorySettingsPage_Description;
+
+	/** */
+	public static String IssueRepositorySettingsPage_StatusError;
+
+	/** */
+	public static String IssueRepositorySettingsPage_StatusSuccess;
+
+	/** */
+	public static String IssueRepositorySettingsPage_TaskContactingServer;
+
+	/** */
+	public static String IssueRepositorySettingsPage_TaskValidating;
+
+	/** */
+	public static String IssueRepositorySettingsPage_Title;
+
+	/** */
+	public static String IssueTaskEditorPageFactory_PageText;
+
+	/** */
+	public static String IssueLabelAttributeEditor_ActionNewLabel;
+
+	/** */
+	public static String IssueLabelAttributeEditor_ActionRemoveLabel;
+
+	/** */
+	public static String IssueLabelAttributeEditor_DescriptionNewLabel;
+
+	/** */
+	public static String IssueLabelAttributeEditor_MessageEnterName;
+
+	/** */
+	public static String IssueLabelAttributeEditor_TitleNewLabel;
+
+	/** */
+	public static String IssueLabelAttributeEditor_TooltipAddLabel;
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/messages.properties b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/messages.properties
new file mode 100644
index 00000000..7bb9f9ae
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/messages.properties
@@ -0,0 +1,28 @@
+IssueRepositoryQueryPage_ErrorLoading=Error loading labels and milestones
+IssueRepositoryQueryPage_AssigneeLabel=Assigned to:
+IssueRepositoryQueryPage_Description=Issue query settings
+IssueRepositoryQueryPage_ErrorStatus=Select a status
+IssueRepositoryQueryPage_LabelsLabel=Labels
+IssueRepositoryQueryPage_MentionsLabel=Mentioning:
+IssueRepositoryQueryPage_MilestoneLabel=Milestone:
+IssueRepositoryQueryPage_MilestoneNone=None
+IssueRepositoryQueryPage_StatusClosed=Closed
+IssueRepositoryQueryPage_StatusLabel=Status:
+IssueRepositoryQueryPage_StatusOpen=Open
+IssueRepositoryQueryPage_TaskLoadingLabels=Loading labels
+IssueRepositoryQueryPage_TaskLoadingMilestones=Loading milestones
+IssueRepositoryQueryPage_TitleLabel=Title:
+IssueRepositoryQueryPage_TooltipUpdateRepository=Update milestones and labels
+IssueRepositorySettingsPage_Description=Enter repository location and credentials
+IssueRepositorySettingsPage_StatusError=Error validating settings: {0}
+IssueRepositorySettingsPage_StatusSuccess=Success\!
+IssueRepositorySettingsPage_TaskContactingServer=Contacting server...
+IssueRepositorySettingsPage_TaskValidating=Validating settings
+IssueRepositorySettingsPage_Title=GitHub Issue Repository Settings
+IssueTaskEditorPageFactory_PageText=GitHub
+IssueLabelAttributeEditor_ActionNewLabel=New Label...
+IssueLabelAttributeEditor_ActionRemoveLabel=Remove Label
+IssueLabelAttributeEditor_DescriptionNewLabel=Label Name:
+IssueLabelAttributeEditor_MessageEnterName=Enter label name
+IssueLabelAttributeEditor_TitleNewLabel=New Label
+IssueLabelAttributeEditor_TooltipAddLabel=Add Label...
-- 
cgit v1.2.3