diff --git a/fortiss-std-env/buckminster/fortiss.rmap b/fortiss-std-env/buckminster/fortiss.rmap
index 6ebfa3e745f122c2d20dfa61ebeeb862fffe7bfd..e2864e65f57b13ea83b4b876b2f7ce9bb32c3033 100644
--- a/fortiss-std-env/buckminster/fortiss.rmap
+++ b/fortiss-std-env/buckminster/fortiss.rmap
@@ -16,11 +16,24 @@
 		</rm:provider>
 
 		<rm:provider
-			readerType="svn"
+			readerType="p2"
 			componentTypes="eclipse.feature"
-			source="true" mutable="true">
-			<rm:uri format="https://orion.fortiss.org/svn/af3/features/{0}">
+			source="true" mutable="false">
+			<rm:uri format="https://{2}:{3}@orion.fortiss.org/svn/af3/features/{0}">
+				<bc:propertyRef key="buckminster.component"/>
+				<bc:propertyRef key="world.user"/>
+				<bc:propertyRef key="world.password"/>
+			</rm:uri>
+		</rm:provider>
+
+		<rm:provider
+			readerType="p2"
+			componentTypes="eclipse.feature"
+			source="true" mutable="false">
+			<rm:uri format="https://{2}:{3}@orion.fortiss.org/svn/af3/sites/{0}">
 				<bc:propertyRef key="buckminster.component"/>
+				<bc:propertyRef key="world.user"/>
+				<bc:propertyRef key="world.password"/>
 			</rm:uri>
 		</rm:provider>
   </rm:searchPath>
@@ -68,7 +81,7 @@
 		</rm:provider>		
   </rm:searchPath>
   
-  <rm:locator pattern="^org\.fortiss\..*" searchPathRef="fortiss"/>
+  <rm:locator pattern="^org\.fortiss\..*" searchPathRef="fortiss" failOnError="false"/>
   <rm:locator pattern="^org\.unicase\..*" searchPathRef="emfstore"/>
   <rm:locator searchPathRef="helios"/>
 </rm:rmap>
diff --git a/fortiss-std-env/project-sets/microAF3.psf b/fortiss-std-env/project-sets/microAF3.psf
deleted file mode 100644
index 0693d6de1cc60874359661faa42f4bbf235644bb..0000000000000000000000000000000000000000
--- a/fortiss-std-env/project-sets/microAF3.psf
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<psf version="2.0">
-<provider id="org.tigris.subversion.subclipse.core.svnnature">
-<project reference="0.9.3,https://orion.fortiss.org/svn/af3/fortiss-std-env,fortiss-std-env"/>
-<project reference="0.9.3,https://orion.fortiss.org/svn/af3/org.fortiss.af3.micro/trunk,org.fortiss.af3.micro"/>
-<project reference="0.9.3,https://orion.fortiss.org/svn/af3/org.fortiss.af3.project/trunk,org.fortiss.af3.project"/>
-</provider>
-<workingSets editPageId="org.eclipse.ui.resourceWorkingSetPage" id="1295531425326_7" label="microAF3" name="microAF3">
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.fortiss.af3.micro" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.fortiss.af3.project" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/fortiss-std-env" type="4"/>
-</workingSets>
-</psf>
\ No newline at end of file
diff --git a/fortiss-std-env/project-sets/tooling-kernel-2-0.psf b/fortiss-std-env/project-sets/tooling-kernel-2-0.psf
deleted file mode 100644
index abd0ca9eacbb61c90c0e85e1bfd1b3e5e72d84cd..0000000000000000000000000000000000000000
--- a/fortiss-std-env/project-sets/tooling-kernel-2-0.psf
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<psf version="2.0">
-<provider id="org.tigris.subversion.subclipse.core.svnnature">
-<project reference="0.9.3,https://orion.fortiss.org/svn/af3/fortiss-std-env,fortiss-std-env"/>
-<project reference="0.9.3,https://orion.fortiss.org/svn/af3/org.fortiss.tooling.compatibility.ccts/trunk,org.fortiss.tooling.compatibility.ccts"/>
-<project reference="0.9.3,https://orion.fortiss.org/svn/af3/org.fortiss.tooling.kernel/trunk,org.fortiss.tooling.kernel"/>
-<project reference="0.9.3,https://orion.fortiss.org/svn/af3/features/org.fortiss.tooling.kernel_feature,org.fortiss.tooling.kernel_feature"/>
-<project reference="0.9.3,https://orion.fortiss.org/svn/af3/org.fortiss.tooling.transformation/trunk,org.fortiss.tooling.transformation"/>
-</provider>
-<workingSets editPageId="org.eclipse.ui.resourceWorkingSetPage" id="1295531407851_6" label="kernel" name="kernel">
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.fortiss.tooling.transformation" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.fortiss.tooling.compatibility.ccts" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/fortiss-std-env" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.fortiss.tooling.kernel" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.fortiss.tooling.kernel_feature" type="4"/>
-</workingSets>
-</psf>
\ No newline at end of file