diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/jee/ui/internal/quickfixes/ejb/CreateBeanQuickFix.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/quickfixes/ejb/CreateBeanQuickFix.java
similarity index 76%
rename from plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/jee/ui/internal/quickfixes/ejb/CreateBeanQuickFix.java
rename to plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/quickfixes/ejb/CreateBeanQuickFix.java
index 816adff..2d8fe83 100644
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/jee/ui/internal/quickfixes/ejb/CreateBeanQuickFix.java
+++ b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/quickfixes/ejb/CreateBeanQuickFix.java
@@ -1,4 +1,14 @@
-package org.eclipse.jst.jee.ui.internal.quickfixes.ejb;
+/*******************************************************************************
+ * Copyright (c) 2010 SAP AG 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:
+ *     SAP AG - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jst.ejb.ui.internal.quickfixes.ejb;
 
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/jee/ui/internal/quickfixes/ejb/Messages.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/quickfixes/ejb/Messages.java
similarity index 76%
rename from plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/jee/ui/internal/quickfixes/ejb/Messages.java
rename to plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/quickfixes/ejb/Messages.java
index a853a5b..58312e0 100644
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/jee/ui/internal/quickfixes/ejb/Messages.java
+++ b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/quickfixes/ejb/Messages.java
@@ -1,21 +1,21 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
+ * Copyright (c) 2010 SAP AG 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:
- *     IBM Corporation - initial API and implementation
+ *     SAP AG - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jst.jee.ui.internal.quickfixes.ejb;
+package org.eclipse.jst.ejb.ui.internal.quickfixes.ejb;
 
 import org.eclipse.osgi.util.NLS;
 
 
 public class Messages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.eclipse.jst.jee.ui.internal.quickfixes.ejb.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.jst.ejb.ui.internal.quickfixes.ejb.messages"; //$NON-NLS-1$
 	
 
 	private Messages() {
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/quickfixes/ejb/NoBeansQuickFixer.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/quickfixes/ejb/NoBeansQuickFixer.java
new file mode 100644
index 0000000..af74cab
--- /dev/null
+++ b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/quickfixes/ejb/NoBeansQuickFixer.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2010 SAP AG 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:
+ *     SAP AG - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jst.ejb.ui.internal.quickfixes.ejb;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.ui.IMarkerResolution;
+import org.eclipse.ui.IMarkerResolutionGenerator2;
+
+public class NoBeansQuickFixer implements IMarkerResolutionGenerator2  {
+
+	public IMarkerResolution[] getResolutions(IMarker marker) {
+        return new IMarkerResolution[] {
+        		new CreateBeanQuickFix(CreateBeanQuickFix.BEAN_TYPE.SESSION, (IProject)marker.getResource()),
+        		new CreateBeanQuickFix(CreateBeanQuickFix.BEAN_TYPE.MESSAGE_DRIVEN, (IProject)marker.getResource())
+        };
+    }
+
+	public boolean hasResolutions(IMarker marker) {
+		return true;
+	}
+	
+}
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/quickfixes/ejb/messages.properties b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/quickfixes/ejb/messages.properties
new file mode 100644
index 0000000..e4aee54
--- /dev/null
+++ b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/quickfixes/ejb/messages.properties
@@ -0,0 +1,13 @@
+###############################################################################
+# Copyright (c) 2010 SAP AG 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:
+#     SAP AG - initial API and implementation
+###############################################################################
+CREATE_NEW_SESSION_BEAN=Create new session bean
+CREATE_NEW_MDB=Create new message driven bean
+
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/jee/ui/internal/quickfixes/ejb/NoBeansQuickFixer.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/jee/ui/internal/quickfixes/ejb/NoBeansQuickFixer.java
deleted file mode 100644
index c99cf03..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/jee/ui/internal/quickfixes/ejb/NoBeansQuickFixer.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.quickfixes.ejb;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.IMarkerResolutionGenerator2;
-
-public class NoBeansQuickFixer implements IMarkerResolutionGenerator2  {
-
-	public IMarkerResolution[] getResolutions(IMarker marker) {
-        return new IMarkerResolution[] {
-        		new CreateBeanQuickFix(CreateBeanQuickFix.BEAN_TYPE.SESSION, (IProject)marker.getResource()),
-        		new CreateBeanQuickFix(CreateBeanQuickFix.BEAN_TYPE.MESSAGE_DRIVEN, (IProject)marker.getResource())
-        };
-    }
-
-	public boolean hasResolutions(IMarker marker) {
-		return true;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/jee/ui/internal/quickfixes/ejb/messages.properties b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/jee/ui/internal/quickfixes/ejb/messages.properties
deleted file mode 100644
index 03c306f..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/jee/ui/internal/quickfixes/ejb/messages.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-CREATE_NEW_SESSION_BEAN=Create new session bean
-CREATE_NEW_MDB=Create new message driven bean
-
diff --git a/plugins/org.eclipse.jst.ejb.ui/plugin.xml b/plugins/org.eclipse.jst.ejb.ui/plugin.xml
index 66a7e0a..6a6e9a5 100644
--- a/plugins/org.eclipse.jst.ejb.ui/plugin.xml
+++ b/plugins/org.eclipse.jst.ejb.ui/plugin.xml
@@ -362,7 +362,7 @@
    
    <extension point="org.eclipse.ui.ide.markerResolution">
       <markerResolutionGenerator
-            class="org.eclipse.jst.jee.ui.internal.quickfixes.ejb.NoBeansQuickFixer"
+            class="org.eclipse.jst.ejb.ui.internal.quickfixes.ejb.NoBeansQuickFixer"
             markerType="org.eclipse.jst.jee.ejb3.nobeans">
       </markerResolutionGenerator>
    </extension>
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/ejb/validation/internal/Messages.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/ejb/validation/internal/Messages.java
index 6e41d72..766fef9 100644
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/ejb/validation/internal/Messages.java
+++ b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/ejb/validation/internal/Messages.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
+ * Copyright (c) 2010 SAP AG 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:
- *     IBM Corporation - initial API and implementation
+ *     SAP AG - initial API and implementation
  *******************************************************************************/
 package org.eclipse.jst.jee.ejb.validation.internal;
 
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/ejb/validation/internal/UIEJB3Validator.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/ejb/validation/internal/UIEJB3Validator.java
index a145ae6..b6beb13 100644
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/ejb/validation/internal/UIEJB3Validator.java
+++ b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/ejb/validation/internal/UIEJB3Validator.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 SAP AG 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:
+ *     SAP AG - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.jst.jee.ejb.validation.internal;
 
 import java.text.MessageFormat;
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/ejb/validation/internal/messages.properties b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/ejb/validation/internal/messages.properties
index 8cc1f5d..128c286 100644
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/ejb/validation/internal/messages.properties
+++ b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/ejb/validation/internal/messages.properties
@@ -1,2 +1,12 @@
+###############################################################################
+# Copyright (c) 2010 SAP AG 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:
+#     SAP AG - initial API and implementation
+###############################################################################
 NO_BEANS_ERROR=An EJB module must contain one or more enterprise beans.
 NO_BEANS_ERROR_LOCATION={0} project