diff --git a/dev/org.eclipselabs.mongoemf.repository/category.xml b/dev/org.eclipselabs.mongoemf.repository/category.xml
index f744cd1..cd64ef6 100644
--- a/dev/org.eclipselabs.mongoemf.repository/category.xml
+++ b/dev/org.eclipselabs.mongoemf.repository/category.xml
@@ -6,9 +6,6 @@
    <feature url="features/org.eclipselabs.mongoemf.converter.feature_0.8.0.qualifier.jar" id="org.eclipselabs.mongoemf.converter.feature" version="0.8.0.qualifier">
       <category name="mongo-emf"/>
    </feature>
-   <feature url="features/org.eclipselabs.mongoemf.core.feature_0.8.0.qualifier.jar" id="org.eclipselabs.mongoemf.core.feature" version="0.8.0.qualifier">
-      <category name="mongo-emf"/>
-   </feature>
    <feature url="features/org.eclipselabs.mongoemf.handlers.feature_0.8.0.qualifier.jar" id="org.eclipselabs.mongoemf.handlers.feature" version="0.8.0.qualifier">
       <category name="mongo-emf"/>
    </feature>
@@ -27,5 +24,8 @@
    <feature url="features/org.eclipselabs.mongoemf.query.mongodb.feature_1.0.0.qualifier.jar" id="org.eclipselabs.mongoemf.query.mongodb.feature" version="1.0.0.qualifier">
       <category name="mongo-emf"/>
    </feature>
+   <feature url="features/org.eclipselabs.mongoemf.api.feature_0.8.0.qualifier.jar" id="org.eclipselabs.mongoemf.api.feature" version="0.8.0.qualifier">
+      <category name="mongo-emf"/>
+   </feature>
    <category-def name="mongo-emf" label="MongoEMF"/>
 </site>
diff --git a/features/org.eclipselabs.mongoemf.core.feature/.project b/features/org.eclipselabs.mongoemf.api.feature/.project
similarity index 86%
rename from features/org.eclipselabs.mongoemf.core.feature/.project
rename to features/org.eclipselabs.mongoemf.api.feature/.project
index 6abfadd..11cacbb 100644
--- a/features/org.eclipselabs.mongoemf.core.feature/.project
+++ b/features/org.eclipselabs.mongoemf.api.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipselabs.mongoemf.core.feature</name>
+	<name>org.eclipselabs.mongoemf.api.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/features/org.eclipselabs.mongoemf.core.feature/build.properties b/features/org.eclipselabs.mongoemf.api.feature/build.properties
similarity index 100%
rename from features/org.eclipselabs.mongoemf.core.feature/build.properties
rename to features/org.eclipselabs.mongoemf.api.feature/build.properties
diff --git a/features/org.eclipselabs.mongoemf.core.feature/feature.xml b/features/org.eclipselabs.mongoemf.api.feature/feature.xml
similarity index 87%
rename from features/org.eclipselabs.mongoemf.core.feature/feature.xml
rename to features/org.eclipselabs.mongoemf.api.feature/feature.xml
index 2ac4f57..72cf941 100644
--- a/features/org.eclipselabs.mongoemf.core.feature/feature.xml
+++ b/features/org.eclipselabs.mongoemf.api.feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.eclipselabs.mongoemf.core.feature"
-      label="MongoEMF Core Runtime"
+      id="org.eclipselabs.mongoemf.api.feature"
+      label="MongoEMF API Runtime"
       version="0.8.0.qualifier"
       provider-name="EclipseLabs">
 
@@ -21,13 +21,13 @@
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.emf.ecore"/>
       <import plugin="org.eclipse.xtext.xbase.lib"/>
+      <import plugin="org.eclipse.emf.ecore.xcore.lib"/>
       <import plugin="org.mongodb.mongo-java-driver"/>
       <import plugin="org.eclipse.emf.ecore.xmi"/>
-      <import plugin="org.eclipse.emf.ecore.xcore.lib"/>
    </requires>
 
    <plugin
-         id="org.eclipselabs.mongoemf.core"
+         id="org.eclipselabs.mongoemf.api"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/features/org.eclipselabs.mongoemf.builders.feature/feature.xml b/features/org.eclipselabs.mongoemf.builders.feature/feature.xml
index edac314..4c4ad11 100644
--- a/features/org.eclipselabs.mongoemf.builders.feature/feature.xml
+++ b/features/org.eclipselabs.mongoemf.builders.feature/feature.xml
@@ -18,11 +18,11 @@
    </license>
 
    <requires>
-      <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.emf.ecore.xmi"/>
       <import plugin="org.mongodb.mongo-java-driver"/>
       <import plugin="org.eclipse.emf.common"/>
-      <import plugin="org.eclipselabs.mongoemf.core"/>
+      <import plugin="org.eclipse.emf.ecore"/>
+      <import plugin="org.eclipse.emf.ecore.xmi"/>
+      <import plugin="org.eclipselabs.mongoemf.api"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipselabs.mongoemf.converter.feature/feature.xml b/features/org.eclipselabs.mongoemf.converter.feature/feature.xml
index 77b300b..3ac5ff3 100644
--- a/features/org.eclipselabs.mongoemf.converter.feature/feature.xml
+++ b/features/org.eclipselabs.mongoemf.converter.feature/feature.xml
@@ -19,7 +19,7 @@
 
    <requires>
       <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipselabs.mongoemf.core"/>
+      <import plugin="org.eclipselabs.mongoemf.api"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipselabs.mongoemf.handlers.feature/feature.xml b/features/org.eclipselabs.mongoemf.handlers.feature/feature.xml
index 09643b7..59dda5a 100644
--- a/features/org.eclipselabs.mongoemf.handlers.feature/feature.xml
+++ b/features/org.eclipselabs.mongoemf.handlers.feature/feature.xml
@@ -21,9 +21,9 @@
       <import plugin="org.mongodb.mongo-java-driver"/>
       <import plugin="org.eclipse.emf.common"/>
       <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipselabs.mongoemf.core"/>
       <import plugin="org.eclipselabs.emodeling.api"/>
       <import plugin="org.eclipselabs.emongo.api"/>
+      <import plugin="org.eclipselabs.mongoemf.api"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipselabs.mongoemf.log.feature/feature.xml b/features/org.eclipselabs.mongoemf.log.feature/feature.xml
index 01736c7..54c20f7 100644
--- a/features/org.eclipselabs.mongoemf.log.feature/feature.xml
+++ b/features/org.eclipselabs.mongoemf.log.feature/feature.xml
@@ -20,10 +20,10 @@
    <requires>
       <import plugin="org.eclipse.emf.common"/>
       <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipselabs.mongoemf.core"/>
-      <import plugin="org.eclipse.osgi"/>
       <import plugin="org.eclipselabs.emodeling.api"/>
       <import plugin="org.eclipselabs.emodeling.log.core"/>
+      <import plugin="org.eclipse.osgi"/>
+      <import plugin="org.eclipselabs.mongoemf.api"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipselabs.mongoemf.query.mongodb.feature/feature.xml b/features/org.eclipselabs.mongoemf.query.mongodb.feature/feature.xml
index 4277f33..7490541 100644
--- a/features/org.eclipselabs.mongoemf.query.mongodb.feature/feature.xml
+++ b/features/org.eclipselabs.mongoemf.query.mongodb.feature/feature.xml
@@ -21,7 +21,7 @@
       <import plugin="org.mongodb.mongo-java-driver"/>
       <import plugin="org.eclipse.emf.common"/>
       <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipselabs.mongoemf.core"/>
+      <import plugin="org.eclipselabs.mongoemf.api"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipselabs.mongoemf.query.simple.feature/feature.xml b/features/org.eclipselabs.mongoemf.query.simple.feature/feature.xml
index d393ca3..79b2016 100644
--- a/features/org.eclipselabs.mongoemf.query.simple.feature/feature.xml
+++ b/features/org.eclipselabs.mongoemf.query.simple.feature/feature.xml
@@ -21,9 +21,9 @@
       <import plugin="org.mongodb.mongo-java-driver"/>
       <import plugin="org.eclipse.emf.common"/>
       <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipselabs.mongoemf.core"/>
       <import plugin="org.eclipse.osgi"/>
-      <import plugin="org.eclipselabs.emodeling.query"/>
+      <import plugin="org.eclipselabs.mongoemf.api"/>
+      <import plugin="org.eclipselabs.emodeling.query.simple"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipselabs.mongoemf.streams.feature/feature.xml b/features/org.eclipselabs.mongoemf.streams.feature/feature.xml
index 83bca24..b81f440 100644
--- a/features/org.eclipselabs.mongoemf.streams.feature/feature.xml
+++ b/features/org.eclipselabs.mongoemf.streams.feature/feature.xml
@@ -22,9 +22,9 @@
       <import plugin="org.eclipse.emf.common"/>
       <import plugin="org.eclipse.emf.ecore"/>
       <import plugin="org.eclipse.emf.ecore.xmi"/>
-      <import plugin="org.eclipselabs.mongoemf.core"/>
       <import plugin="org.eclipselabs.emodeling.api"/>
       <import plugin="org.eclipselabs.emongo.api"/>
+      <import plugin="org.eclipselabs.mongoemf.api"/>
    </requires>
 
    <plugin