diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/refactor/MoveExportedClassParticipant.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/refactor/MoveExportedClassParticipant.java
new file mode 100644
index 0000000..262fe95
--- /dev/null
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/refactor/MoveExportedClassParticipant.java
@@ -0,0 +1,139 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.felix.sigil.eclipse.ui.internal.refactor;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.eclipse.model.util.ModelHelper;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IJavaModel;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.ltk.core.refactoring.Change;
+import org.eclipse.ltk.core.refactoring.CompositeChange;
+import org.eclipse.ltk.core.refactoring.NullChange;
+import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
+import org.eclipse.ltk.core.refactoring.participants.MoveParticipant;
+
+public class MoveExportedClassParticipant extends MoveParticipant
+{
+    private ICompilationUnit compilationUnit;
+    private List<Change> changes = new LinkedList<Change>();
+
+    @Override
+    public RefactoringStatus checkConditions(IProgressMonitor monitor,
+        CheckConditionsContext ctx) throws OperationCanceledException
+    {
+        RefactoringStatus status = null;
+        if (getArguments().getUpdateReferences())
+        {
+            try
+            {
+                ISigilProjectModel sourceProject = SigilCore.create(compilationUnit.getJavaProject().getProject());
+                RefactorUtil.touch(ctx, sourceProject);
+                IPackageFragment packageFragment = (IPackageFragment) compilationUnit.getAncestor(IJavaModel.PACKAGE_FRAGMENT);
+                final String packageName = packageFragment.getElementName();
+                IPackageExport oldExport = ModelHelper.findExport(sourceProject,
+                    packageName);
+
+                if (oldExport != null) {
+                    status = RefactoringStatus.createWarningStatus("Moving a class from an exported package effects client bundles");
+                    
+                    IPackageFragment dest = (IPackageFragment) getArguments().getDestination();
+                    ISigilProjectModel destProject = SigilCore.create(dest.getJavaProject().getProject());
+
+                    if (!destProject.equals(sourceProject)) {
+                        status.addWarning("Moving an exported class to another bundle effects client bundles that use Require-Bundle");
+                    }
+                    
+                    IPackageExport newExport = ModelHelper.findExport(destProject,
+                        dest.getElementName());
+                    
+                    if ( newExport == null ) {
+                        newExport = RefactorUtil.createNewExport(status, changes, destProject, dest.getElementName());
+                    }
+                    
+                    if ( packageFragment.getCompilationUnits().length == 1 ) {
+                        status.addInfo("Last exported class removed from " + packageName);
+                        changes.add( new ExportPackageChange(sourceProject, oldExport, null));
+                    }
+                }
+            }
+            catch (CoreException e)
+            {
+                SigilCore.warn("Failed to update activator", e);
+            }
+        }
+
+        return status;
+    }
+
+    /**
+     * @param pf 
+     * @param compilationUnit2
+     * @return
+     */
+    private static String qualifiedName(IPackageFragment pf, String name)
+    {
+        name = name.substring(0, name.lastIndexOf('.'));
+        return "".equals(pf.getElementName()) ? name : pf.getElementName() + '.' + name;
+    }
+
+    @Override
+    public Change createChange(IProgressMonitor monitor) throws CoreException,
+        OperationCanceledException
+    {
+        if (changes.isEmpty())
+        {
+            return new NullChange();
+        }
+        else
+        {
+            CompositeChange ret = new CompositeChange("Export-Package update");
+
+            ret.addAll(changes.toArray(new Change[changes.size()]));
+
+            return ret;
+        }
+    }
+
+    @Override
+    public String getName()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    protected boolean initialize(Object element)
+    {
+        compilationUnit = (ICompilationUnit) element;
+        return true;
+    }
+
+}