32 files changed, 50 insertions, 36 deletions
diff --git a/org.eclipse.jubula.feature.api/feature.xml b/org.eclipse.jubula.feature.api/feature.xml
index da5becc7e..a4301fad6 100644
--- a/org.eclipse.jubula.feature.api/feature.xml
+++ b/org.eclipse.jubula.feature.api/feature.xml
@@ -83,7 +83,7 @@ BREDEX GmbH - initial API and implementation and/or initial documentation
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.jubula.toolkit.mobile.ios.api"
+         id="org.eclipse.jubula.toolkit.ios.api"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/org.eclipse.jubula.feature/feature.xml b/org.eclipse.jubula.feature/feature.xml
index 63fce82cd..8d2104b6c 100644
--- a/org.eclipse.jubula.feature/feature.xml
+++ b/org.eclipse.jubula.feature/feature.xml
@@ -95,7 +95,7 @@ BREDEX GmbH - initial API and implementation and/or initial documentation
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.jubula.toolkit.mobile.ios.provider"
+         id="org.eclipse.jubula.toolkit.ios.provider"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/org.eclipse.jubula.releng.client/pom.xml b/org.eclipse.jubula.releng.client/pom.xml
index cdf36cff2..c1d166996 100644
--- a/org.eclipse.jubula.releng.client/pom.xml
+++ b/org.eclipse.jubula.releng.client/pom.xml
@@ -41,16 +41,16 @@
 		<module>../org.eclipse.jubula.toolkit.gef.provider</module>
 		<module>../org.eclipse.jubula.toolkit.html.api</module>
 		<module>../org.eclipse.jubula.toolkit.html.provider</module>
-		<module>../org.eclipse.jubula.toolkit.rcp.api</module>
-		<module>../org.eclipse.jubula.toolkit.rcp.provider</module>
-		<module>../org.eclipse.jubula.toolkit.swing.api</module>
-		<module>../org.eclipse.jubula.toolkit.swing.provider</module>
+		<module>../org.eclipse.jubula.toolkit.ios.api</module>
+		<module>../org.eclipse.jubula.toolkit.ios.provider</module>
 		<module>../org.eclipse.jubula.toolkit.javafx.api</module>
 		<module>../org.eclipse.jubula.toolkit.javafx.provider</module>
 		<module>../org.eclipse.jubula.toolkit.mobile.api</module>
 		<module>../org.eclipse.jubula.toolkit.mobile.provider</module>
-		<module>../org.eclipse.jubula.toolkit.mobile.ios.api</module>
-		<module>../org.eclipse.jubula.toolkit.mobile.ios.provider</module>
+		<module>../org.eclipse.jubula.toolkit.rcp.api</module>
+		<module>../org.eclipse.jubula.toolkit.rcp.provider</module>
+		<module>../org.eclipse.jubula.toolkit.swing.api</module>
+		<module>../org.eclipse.jubula.toolkit.swing.provider</module>
 		<module>../org.eclipse.jubula.toolkit.swt.api</module>
 		<module>../org.eclipse.jubula.toolkit.swt.provider</module>
         <module>../org.eclipse.jubula.toolkit.win.api</module>
diff --git a/org.eclipse.jubula.toolkit.api.gen/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.api.gen/META-INF/MANIFEST.MF
index 7aca44f7a..ed1213417 100644
--- a/org.eclipse.jubula.toolkit.api.gen/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.api.gen/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.apache.commons.logging;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.jubula.toolkit.concrete.provider;bundle-version="[2.4.0,2.5.0)",
  org.eclipse.jubula.toolkit.html.provider;bundle-version="[2.4.0,2.5.0)",
  org.eclipse.jubula.toolkit.javafx.provider;bundle-version="[2.4.0,2.5.0)",
- org.eclipse.jubula.toolkit.mobile.ios.provider;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.toolkit.ios.provider;bundle-version="[2.4.0,2.5.0)",
  org.eclipse.jubula.toolkit.mobile.provider;bundle-version="[2.4.0,2.5.0)",
  org.eclipse.jubula.toolkit.gef.provider;bundle-version="[2.4.0,2.5.0)",
  org.eclipse.jubula.toolkit.rcp.provider;bundle-version="[2.4.0,2.5.0)",
diff --git a/org.eclipse.jubula.toolkit.api.gen/resources/apigen.properties b/org.eclipse.jubula.toolkit.api.gen/resources/apigen.properties
index 8fe0a9773..a95c7552b 100644
--- a/org.eclipse.jubula.toolkit.api.gen/resources/apigen.properties
+++ b/org.eclipse.jubula.toolkit.api.gen/resources/apigen.properties
@@ -6,7 +6,7 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################
 # Comma-separated list of toolkits to generate
-api.gen.toolkit.names=base, concrete, gef, html, javafx, rcp, swing, swt, win, winapps
+api.gen.toolkit.names=base, concrete, gef, html, ios, javafx, mobile, rcp, swing, swt, win, winapps
 api.gen.toolkit.name.scheme=../org.eclipse.jubula.toolkit.{0}.provider
 # name of the xml file used to describe a toolkit
 api.gen.toolkit.xml.conf=resources/xml/ComponentConfiguration.xml
diff --git a/org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/NameLoader.java b/org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/NameLoader.java
index fcfee73ef..d90b0928b 100644
--- a/org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/NameLoader.java
+++ b/org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/NameLoader.java
@@ -190,8 +190,7 @@ public class NameLoader {
      * @return the adjusted string
      */
     public String executeExceptions(String string) {
-        return string.replace("abstract", "base") //$NON-NLS-1$ //$NON-NLS-2$
-                .replace("ios", "mobile.ios"); //$NON-NLS-1$ //$NON-NLS-2$
+        return string.replace("abstract", "base"); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.api/.checkstyle b/org.eclipse.jubula.toolkit.ios.api/.checkstyle
index 7e922b196..7e922b196 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.api/.checkstyle
+++ b/org.eclipse.jubula.toolkit.ios.api/.checkstyle
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.api/.classpath b/org.eclipse.jubula.toolkit.ios.api/.classpath
index e29f56c12..e29f56c12 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.api/.classpath
+++ b/org.eclipse.jubula.toolkit.ios.api/.classpath
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.api/.gitignore b/org.eclipse.jubula.toolkit.ios.api/.gitignore
index 9d12075e6..9d12075e6 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.api/.gitignore
+++ b/org.eclipse.jubula.toolkit.ios.api/.gitignore
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.provider/.project b/org.eclipse.jubula.toolkit.ios.api/.project
index f7337c622..cfed7514b 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.provider/.project
+++ b/org.eclipse.jubula.toolkit.ios.api/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.jubula.toolkit.mobile.ios.provider</name>
+	<name>org.eclipse.jubula.toolkit.ios.api</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -31,9 +31,16 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
+	<linkedResources>
+		<link>
+			<name>.settings</name>
+			<type>2</type>
+			<locationURI>copy_PARENT/org.eclipse.jubula.project.configuration/settings/1.6</locationURI>
+		</link>
+	</linkedResources>
 	<filteredResources>
 		<filter>
-			<id>1409218333740</id>
+			<id>0</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -42,11 +49,10 @@
 			</matcher>
 		</filter>
 	</filteredResources>
-	<linkedResources>
-		<link>
-			<name>.settings</name>
-			<type>2</type>
-			<locationURI>PARENT-1-PROJECT_LOC/org.eclipse.jubula.project.configuration/settings/1.7</locationURI>
-		</link>
-	</linkedResources>
+	<variableList>
+		<variable>
+			<name>copy_PARENT</name>
+			<value>$%7BPARENT-2-PROJECT_LOC%7D/repos/org.eclipse.jubula.core</value>
+		</variable>
+	</variableList>
 </projectDescription>
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.api/.settings/org.eclipse.wst.validation.prefs b/org.eclipse.jubula.toolkit.ios.api/.settings/org.eclipse.wst.validation.prefs
index 3c2585fb6..3c2585fb6 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.api/.settings/org.eclipse.wst.validation.prefs
+++ b/org.eclipse.jubula.toolkit.ios.api/.settings/org.eclipse.wst.validation.prefs
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.ios.api/META-INF/MANIFEST.MF
index 0644f03c4..289568382 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.ios.api/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Jubula Toolkit - iOS - API
-Bundle-SymbolicName: org.eclipse.jubula.toolkit.mobile.ios.api
+Bundle-SymbolicName: org.eclipse.jubula.toolkit.ios.api
 Bundle-Version: 2.4.0.qualifier
 Bundle-Vendor: Eclipse Jubula
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
@@ -9,4 +9,6 @@ Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
  org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)",
- org.eclipse.jubula.toolkit.concrete.api;bundle-version="[2.4.0,2.5.0)"
+ org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.toolkit.concrete.api;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.toolkit.mobile.api;bundle-version="[2.4.0,2.5.0)"
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.api/about.html b/org.eclipse.jubula.toolkit.ios.api/about.html
index f1be81099..f1be81099 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.api/about.html
+++ b/org.eclipse.jubula.toolkit.ios.api/about.html
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.api/build.properties b/org.eclipse.jubula.toolkit.ios.api/build.properties
index 24e18439c..24e18439c 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.api/build.properties
+++ b/org.eclipse.jubula.toolkit.ios.api/build.properties
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.api/pom.xml b/org.eclipse.jubula.toolkit.ios.api/pom.xml
index ada3feda6..9f354b651 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.api/pom.xml
+++ b/org.eclipse.jubula.toolkit.ios.api/pom.xml
@@ -8,7 +8,7 @@
 		<version>2.4.0-SNAPSHOT</version>
 		<relativePath>../org.eclipse.jubula.releng.client</relativePath>
 	</parent>
-	<artifactId>org.eclipse.jubula.toolkit.mobile.ios.api</artifactId>
+	<artifactId>org.eclipse.jubula.toolkit.ios.api</artifactId>
 	<packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.api/src-gen/.keep b/org.eclipse.jubula.toolkit.ios.api/src/org/eclipse/jubula/toolkit/ios/internal/.keep
index e69de29bb..e69de29bb 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.api/src-gen/.keep
+++ b/org.eclipse.jubula.toolkit.ios.api/src/org/eclipse/jubula/toolkit/ios/internal/.keep
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.provider/.checkstyle b/org.eclipse.jubula.toolkit.ios.provider/.checkstyle
index 80f189725..80f189725 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.provider/.checkstyle
+++ b/org.eclipse.jubula.toolkit.ios.provider/.checkstyle
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.provider/.classpath b/org.eclipse.jubula.toolkit.ios.provider/.classpath
index 098194ca4..098194ca4 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.provider/.classpath
+++ b/org.eclipse.jubula.toolkit.ios.provider/.classpath
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.provider/.gitignore b/org.eclipse.jubula.toolkit.ios.provider/.gitignore
index 934e0e06f..934e0e06f 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.provider/.gitignore
+++ b/org.eclipse.jubula.toolkit.ios.provider/.gitignore
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.api/.project b/org.eclipse.jubula.toolkit.ios.provider/.project
index 59043e0f1..5029df7c2 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.api/.project
+++ b/org.eclipse.jubula.toolkit.ios.provider/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.jubula.toolkit.mobile.ios.api</name>
+	<name>org.eclipse.jubula.toolkit.ios.provider</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -35,12 +35,12 @@
 		<link>
 			<name>.settings</name>
 			<type>2</type>
-			<locationURI>PARENT-1-PROJECT_LOC/org.eclipse.jubula.project.configuration/settings/1.6</locationURI>
+			<locationURI>copy_PARENT/org.eclipse.jubula.project.configuration/settings/1.7</locationURI>
 		</link>
 	</linkedResources>
 	<filteredResources>
 		<filter>
-			<id>1409218333740</id>
+			<id>0</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -49,4 +49,10 @@
 			</matcher>
 		</filter>
 	</filteredResources>
+	<variableList>
+		<variable>
+			<name>copy_PARENT</name>
+			<value>$%7BPARENT-2-PROJECT_LOC%7D/repos/org.eclipse.jubula.core</value>
+		</variable>
+	</variableList>
 </projectDescription>
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.provider/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.ios.provider/META-INF/MANIFEST.MF
index de8fd37cc..f8c2373f8 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.provider/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.ios.provider/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Jubula Toolkit - iOS
-Bundle-SymbolicName: org.eclipse.jubula.toolkit.mobile.ios.provider;singleton:=true
+Bundle-SymbolicName: org.eclipse.jubula.toolkit.ios.provider;singleton:=true
 Bundle-Version: 2.4.0.qualifier
-Bundle-Activator: org.eclipse.jubula.toolkit.mobile.ios.provider.Activator
+Bundle-Activator: org.eclipse.jubula.toolkit.ios.provider.Activator
 Bundle-Vendor: Eclipse Jubula
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.jubula.ui.compatibility;bundle-version="[2.4.0,2.5.0)",
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.provider/about.html b/org.eclipse.jubula.toolkit.ios.provider/about.html
index f1be81099..f1be81099 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.provider/about.html
+++ b/org.eclipse.jubula.toolkit.ios.provider/about.html
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.provider/build.properties b/org.eclipse.jubula.toolkit.ios.provider/build.properties
index d4f24588d..d4f24588d 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.provider/build.properties
+++ b/org.eclipse.jubula.toolkit.ios.provider/build.properties
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.provider/plugin.xml b/org.eclipse.jubula.toolkit.ios.provider/plugin.xml
index fd46b8a53..008977ab9 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.provider/plugin.xml
+++ b/org.eclipse.jubula.toolkit.ios.provider/plugin.xml
@@ -10,7 +10,7 @@
    <extension
          point="org.eclipse.jubula.toolkit.common.toolkitsupport">
       <toolkit
-            IToolkitProvider="org.eclipse.jubula.toolkit.mobile.ios.provider.ToolkitProvider"
+            IToolkitProvider="org.eclipse.jubula.toolkit.ios.provider.ToolkitProvider"
             includes="ui.toolkit.MobileToolkitPlugin"
             isUserToolkit="false"
             level="toolkit"
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.provider/pom.xml b/org.eclipse.jubula.toolkit.ios.provider/pom.xml
index b3f9e58b3..a9dd8b313 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.provider/pom.xml
+++ b/org.eclipse.jubula.toolkit.ios.provider/pom.xml
@@ -17,7 +17,7 @@
 		<relativePath>../org.eclipse.jubula.releng.client</relativePath>
 	</parent>
 
-	<artifactId>org.eclipse.jubula.toolkit.mobile.ios.provider</artifactId>
+	<artifactId>org.eclipse.jubula.toolkit.ios.provider</artifactId>
 	<packaging>eclipse-plugin</packaging>
 
 	<build>
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.provider/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.ios.provider/resources/xml/ComponentConfiguration.xml
index c200099b7..a9aa58d54 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.provider/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.toolkit.ios.provider/resources/xml/ComponentConfiguration.xml
@@ -75,7 +75,7 @@
   
   <!-- Label -->
   <concreteComponent type="abstract.ios.TextVerifiable">
-    <realizes>guidancer.abstract.TextVerifiable</realizes>
+    <realizes>guidancer.concrete.Label</realizes>
     <action name="CompSystem.Swipe" changed="1.00">
       <method>rcSwipe</method>
       <param name="CompSystem.Direction">
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.provider/src/org/eclipse/jubula/toolkit/mobile/ios/provider/Activator.java b/org.eclipse.jubula.toolkit.ios.provider/src/org/eclipse/jubula/toolkit/ios/provider/Activator.java
index 23ab89fd6..858c25fc3 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.provider/src/org/eclipse/jubula/toolkit/mobile/ios/provider/Activator.java
+++ b/org.eclipse.jubula.toolkit.ios.provider/src/org/eclipse/jubula/toolkit/ios/provider/Activator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     BREDEX GmbH - initial API and implementation and/or initial documentation
  *******************************************************************************/
-package org.eclipse.jubula.toolkit.mobile.ios.provider;
+package org.eclipse.jubula.toolkit.ios.provider;
 
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.provider/src/org/eclipse/jubula/toolkit/mobile/ios/provider/I18nStrings.properties b/org.eclipse.jubula.toolkit.ios.provider/src/org/eclipse/jubula/toolkit/ios/provider/I18nStrings.properties
index 8750aebf6..8750aebf6 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.provider/src/org/eclipse/jubula/toolkit/mobile/ios/provider/I18nStrings.properties
+++ b/org.eclipse.jubula.toolkit.ios.provider/src/org/eclipse/jubula/toolkit/ios/provider/I18nStrings.properties
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.provider/src/org/eclipse/jubula/toolkit/mobile/ios/provider/ToolkitProvider.java b/org.eclipse.jubula.toolkit.ios.provider/src/org/eclipse/jubula/toolkit/ios/provider/ToolkitProvider.java
index a650ac589..1e678bc1d 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.provider/src/org/eclipse/jubula/toolkit/mobile/ios/provider/ToolkitProvider.java
+++ b/org.eclipse.jubula.toolkit.ios.provider/src/org/eclipse/jubula/toolkit/ios/provider/ToolkitProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     BREDEX GmbH - initial API and implementation and/or initial documentation
  *******************************************************************************/
-package org.eclipse.jubula.toolkit.mobile.ios.provider;
+package org.eclipse.jubula.toolkit.ios.provider;
 
 import java.net.URL;
 import java.util.Map;
@@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Composite;
 public class ToolkitProvider implements IToolKitProvider {
     /** <code>I18N_PROPERTIES</code> */
     private static final String I18N_PROPERTIES = 
-        "org.eclipse.jubula.toolkit.mobile.ios.provider.I18nStrings"; //$NON-NLS-1$
+        "org.eclipse.jubula.toolkit.ios.provider.I18nStrings"; //$NON-NLS-1$
 
     /**{@inheritDoc} */
     public Composite getAutConfigDialog(Composite parent, int style,
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.provider/src/org/eclipse/jubula/toolkit/mobile/ios/provider/ui/IOSAutConfigComponent.java b/org.eclipse.jubula.toolkit.ios.provider/src/org/eclipse/jubula/toolkit/ios/provider/ui/IOSAutConfigComponent.java
index 9d222a179..e12a720c0 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.provider/src/org/eclipse/jubula/toolkit/mobile/ios/provider/ui/IOSAutConfigComponent.java
+++ b/org.eclipse.jubula.toolkit.ios.provider/src/org/eclipse/jubula/toolkit/ios/provider/ui/IOSAutConfigComponent.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     BREDEX GmbH - initial API and implementation and/or initial documentation
  *******************************************************************************/
-package org.eclipse.jubula.toolkit.mobile.ios.provider.ui;
+package org.eclipse.jubula.toolkit.ios.provider.ui;
 
 import java.util.Map;
 
diff --git a/org.eclipse.jubula.toolkit.mobile.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.mobile.api/META-INF/MANIFEST.MF
index 941a97411..bdfcd84be 100644
--- a/org.eclipse.jubula.toolkit.mobile.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.mobile.api/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@ Bundle-Vendor: Eclipse Jubula
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
+Export-Package: org.eclipse.jubula.toolkit.mobile
 Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
  org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)",
  org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)",
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.api/src/org/eclipse/jubula/toolkit/mobile/ios/internal/.keep b/org.eclipse.jubula.toolkit.mobile.ios.api/src/org/eclipse/jubula/toolkit/mobile/ios/internal/.keep
deleted file mode 100644
index e69de29bb..000000000
--- a/org.eclipse.jubula.toolkit.mobile.ios.api/src/org/eclipse/jubula/toolkit/mobile/ios/internal/.keep
+++ /dev/null