diff --git a/src/Symfony/Components/DependencyInjection/Dumper/XmlDumper.php b/src/Symfony/Components/DependencyInjection/Dumper/XmlDumper.php
index 4c0ac3bb18..53ed1a225b 100644
--- a/src/Symfony/Components/DependencyInjection/Dumper/XmlDumper.php
+++ b/src/Symfony/Components/DependencyInjection/Dumper/XmlDumper.php
@@ -165,9 +165,9 @@ class XmlDumper extends Dumper
     return <<<EOF
 <?xml version="1.0" ?>
 
-<container xmlns="http://www.symfony-project.org/schema/services"
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.symfony-project.org/schema/services http://www.symfony-project.org/schema/services/services-1.0.xsd">
+    xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
 
 EOF;
   }
diff --git a/src/Symfony/Components/DependencyInjection/Loader/Extension/DoctrineExtension.php b/src/Symfony/Components/DependencyInjection/Loader/Extension/DoctrineExtension.php
index 1a3123c72f..c4823fdf10 100644
--- a/src/Symfony/Components/DependencyInjection/Loader/Extension/DoctrineExtension.php
+++ b/src/Symfony/Components/DependencyInjection/Loader/Extension/DoctrineExtension.php
@@ -60,7 +60,7 @@ class DoctrineExtension extends LoaderExtension
    */
   public function getNamespace()
   {
-    return 'http://www.symfony-project.org/schema/doctrine';
+    return 'http://www.symfony-project.org/schema/dic/doctrine';
   }
 
   /**
diff --git a/src/Symfony/Components/DependencyInjection/Loader/Extension/SwiftMailerExtension.php b/src/Symfony/Components/DependencyInjection/Loader/Extension/SwiftMailerExtension.php
index e92d43a735..e99f28aa9e 100644
--- a/src/Symfony/Components/DependencyInjection/Loader/Extension/SwiftMailerExtension.php
+++ b/src/Symfony/Components/DependencyInjection/Loader/Extension/SwiftMailerExtension.php
@@ -107,7 +107,7 @@ class SwiftMailerExtension extends LoaderExtension
    */
   public function getNamespace()
   {
-    return 'http://www.symfony-project.org/schema/swiftmailer';
+    return 'http://www.symfony-project.org/schema/dic/swiftmailer';
   }
 
   /**
diff --git a/src/Symfony/Components/DependencyInjection/Loader/Extension/SymfonyTemplatingExtension.php b/src/Symfony/Components/DependencyInjection/Loader/Extension/SymfonyTemplatingExtension.php
index e6531811a0..a98ad8a7f4 100644
--- a/src/Symfony/Components/DependencyInjection/Loader/Extension/SymfonyTemplatingExtension.php
+++ b/src/Symfony/Components/DependencyInjection/Loader/Extension/SymfonyTemplatingExtension.php
@@ -112,7 +112,7 @@ class SymfonyTemplatingExtension extends LoaderExtension
    */
   public function getNamespace()
   {
-    return 'http://www.symfony-project.org/schema/symfony';
+    return 'http://www.symfony-project.org/schema/dic/symfony';
   }
 
   /**
diff --git a/src/Symfony/Components/DependencyInjection/Loader/Extension/ZendExtension.php b/src/Symfony/Components/DependencyInjection/Loader/Extension/ZendExtension.php
index c229278a84..35f16d367f 100644
--- a/src/Symfony/Components/DependencyInjection/Loader/Extension/ZendExtension.php
+++ b/src/Symfony/Components/DependencyInjection/Loader/Extension/ZendExtension.php
@@ -122,7 +122,7 @@ class ZendExtension extends LoaderExtension
 
   public function getNamespace()
   {
-    return 'http://www.symfony-project.org/schema/zend';
+    return 'http://www.symfony-project.org/schema/dic/zend';
   }
 
   public function getAlias()
diff --git a/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/doctrine/dbal-1.0.xml b/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/doctrine/dbal-1.0.xml
index 8974b4765c..25e9509d04 100644
--- a/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/doctrine/dbal-1.0.xml
+++ b/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/doctrine/dbal-1.0.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 
-<container xmlns="http://www.symfony-project.org/schema/services"
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.symfony-project.org/schema/services http://www.symfony-project.org/schema/services/services-1.0.xsd">
+    xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
 
   <parameters>
     <parameter key="doctrine.dbal.user">root</parameter>
diff --git a/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/swiftmailer/swiftmailer-1.0.xml b/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/swiftmailer/swiftmailer-1.0.xml
index 81f9f63925..718cd7f330 100644
--- a/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/swiftmailer/swiftmailer-1.0.xml
+++ b/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/swiftmailer/swiftmailer-1.0.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<container xmlns="http://www.symfony-project.org/schema/services"
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.symfony-project.org/schema/services http://www.symfony-project.org/schema/services/services-1.0.xsd">
+    xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
 
   <parameters>
     <parameter key="swiftmailer.class">Swift_Mailer</parameter>
diff --git a/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/symfony/templating-1.0.xml b/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/symfony/templating-1.0.xml
index 8d2e031aec..01c5bbc1b9 100644
--- a/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/symfony/templating-1.0.xml
+++ b/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/symfony/templating-1.0.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 
-<container xmlns="http://www.symfony-project.org/schema/services"
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.symfony-project.org/schema/services http://www.symfony-project.org/schema/services/services-1.0.xsd">
+    xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
 
   <parameters>
     <parameter key="symfony.templating.engine.class">Symfony\Components\Templating\Engine</parameter>
diff --git a/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/zend/logger-1.0.xml b/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/zend/logger-1.0.xml
index 5352dfd494..5eac46e780 100644
--- a/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/zend/logger-1.0.xml
+++ b/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/zend/logger-1.0.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 
-<container xmlns="http://www.symfony-project.org/schema/services"
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.symfony-project.org/schema/services http://www.symfony-project.org/schema/services/services-1.0.xsd">
+    xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
 
   <parameters>
     <parameter key="zend.logger.class">\Zend_Log</parameter>
diff --git a/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/zend/mail-1.0.xml b/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/zend/mail-1.0.xml
index fba8776fa8..bbbe845205 100644
--- a/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/zend/mail-1.0.xml
+++ b/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/zend/mail-1.0.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 
-<container xmlns="http://www.symfony-project.org/schema/services"
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.symfony-project.org/schema/services http://www.symfony-project.org/schema/services/services-1.0.xsd">
+    xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
 
   <parameters>
     <parameter key="zend.mail.class">Zend_Mail</parameter>
diff --git a/src/Symfony/Components/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Components/DependencyInjection/Loader/XmlFileLoader.php
index 0e1b911ab4..6e3881cacc 100644
--- a/src/Symfony/Components/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Components/DependencyInjection/Loader/XmlFileLoader.php
@@ -211,7 +211,7 @@ class XmlFileLoader extends FileLoader
     $count = 0;
 
     // find anonymous service definitions
-    $xml->registerXPathNamespace('container', 'http://www.symfony-project.org/schema/services');
+    $xml->registerXPathNamespace('container', 'http://www.symfony-project.org/schema/dic/services');
     $nodes = $xml->xpath('//container:argument[@type="service"][not(@id)]');
     foreach ($nodes as $node)
     {
@@ -243,7 +243,7 @@ class XmlFileLoader extends FileLoader
 
   protected function validateSchema($dom, $file)
   {
-    $schemaLocations = array('http://www.symfony-project.org/schema/services' => __DIR__.'/schema/services/services-1.0.xsd');
+    $schemaLocations = array('http://www.symfony-project.org/schema/dic/services' => __DIR__.'/schema/dic/services/services-1.0.xsd');
 
     if ($element = $dom->documentElement->getAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'schemaLocation'))
     {
@@ -290,7 +290,7 @@ EOF
         continue;
       }
 
-      if ($node->namespaceURI === 'http://www.symfony-project.org/schema/services')
+      if ($node->namespaceURI === 'http://www.symfony-project.org/schema/dic/services')
       {
         throw new \InvalidArgumentException(sprintf('The "%s" tag is not valid (in %s).', $node->tagName, $file));
       }
@@ -327,7 +327,7 @@ EOF
   {
     foreach (dom_import_simplexml($xml)->childNodes as $node)
     {
-      if (!$node instanceof \DOMElement || $node->namespaceURI === 'http://www.symfony-project.org/schema/services')
+      if (!$node instanceof \DOMElement || $node->namespaceURI === 'http://www.symfony-project.org/schema/dic/services')
       {
         continue;
       }
diff --git a/src/Symfony/Components/DependencyInjection/Loader/schema/doctrine/doctrine-1.0.xsd b/src/Symfony/Components/DependencyInjection/Loader/schema/doctrine/doctrine-1.0.xsd
deleted file mode 100644
index 01ad5fbdc1..0000000000
--- a/src/Symfony/Components/DependencyInjection/Loader/schema/doctrine/doctrine-1.0.xsd
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<xsd:schema xmlns="http://www.symfony-project.org/schema/doctrine"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.symfony-project.org/schema/doctrine"
-    elementFormDefault="qualified">
-
-  <xsd:element name="dbal" type="dbal" />
-
-  <xsd:complexType name="dbal">
-    <xsd:attribute name="dbname" type="xsd:string" />
-    <xsd:attribute name="host" type="xsd:string" />
-    <xsd:attribute name="username" type="xsd:string" />
-    <xsd:attribute name="password" type="xsd:string" />
-  </xsd:complexType>
-</xsd:schema>
diff --git a/src/Symfony/Components/DependencyInjection/Loader/schema/services/services-1.0.xsd b/src/Symfony/Components/DependencyInjection/Loader/schema/services/services-1.0.xsd
deleted file mode 100644
index b86a54cb5b..0000000000
--- a/src/Symfony/Components/DependencyInjection/Loader/schema/services/services-1.0.xsd
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<xsd:schema xmlns="http://www.symfony-project.org/schema/services"
-     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-     targetNamespace="http://www.symfony-project.org/schema/services"
-     elementFormDefault="qualified">
-
-  <xsd:annotation>
-    <xsd:documentation><![CDATA[
-      Symfony XML Services Schema, version 1.0
-      Authors: Fabien Potencier
-
-      This defines a way to describe PHP objects (services) and their
-      dependencies.
-    ]]></xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:element name="container" type="container" />
-
-  <xsd:complexType name="container">
-    <xsd:annotation>
-      <xsd:documentation><![CDATA[
-        The root element of a service file.
-      ]]></xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="imports" type="imports" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="parameters" type="parameters" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="services" type="services" minOccurs="0" maxOccurs="1" />
-      <xsd:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="services">
-    <xsd:annotation>
-      <xsd:documentation><![CDATA[
-        Enclosing element for the definition of all services
-      ]]></xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="service" type="service" minOccurs="1" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="imports">
-    <xsd:annotation>
-      <xsd:documentation><![CDATA[
-        Enclosing element for the import elements
-      ]]></xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="import" type="import" minOccurs="1" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="import">
-    <xsd:annotation>
-      <xsd:documentation><![CDATA[
-        Import an external resource defining other services or parameters
-      ]]></xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="resource" type="xsd:string" use="required" />
-    <xsd:attribute name="class" type="xsd:string">
-      <xsd:annotation>
-        <xsd:documentation><![CDATA[
-          The PHP class able to load the resource. If not defined, the loader uses the current loader.
-        ]]></xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-  </xsd:complexType>
-
-  <xsd:complexType name="configurator">
-    <xsd:attribute name="id" type="xsd:string" />
-    <xsd:attribute name="service" type="xsd:string" />
-    <xsd:attribute name="class" type="xsd:string" />
-    <xsd:attribute name="method" type="xsd:string" />
-    <xsd:attribute name="function" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="service">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:element name="file" type="xsd:string" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="argument" type="argument" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="configurator" type="configurator" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="call" type="call" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:choice>
-    <xsd:attribute name="id" type="xsd:string" />
-    <xsd:attribute name="class" type="xsd:string" />
-    <xsd:attribute name="shared" type="boolean" />
-    <xsd:attribute name="constructor" type="xsd:string" />
-    <xsd:attribute name="alias" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="parameters">
-    <xsd:sequence>
-      <xsd:element name="parameter" type="parameter" minOccurs="1" maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="type" type="parameter_type" />
-    <xsd:attribute name="key" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="parameter" mixed="true">
-    <xsd:sequence>
-      <xsd:element name="parameter" type="parameter" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="type" type="parameter_type" />
-    <xsd:attribute name="id" type="xsd:string" />
-    <xsd:attribute name="key" type="xsd:string" />
-    <xsd:attribute name="on-invalid" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="argument" mixed="true">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:element name="argument" type="argument" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="service" type="service" />
-    </xsd:choice>
-    <xsd:attribute name="type" type="argument_type" />
-    <xsd:attribute name="id" type="xsd:string" />
-    <xsd:attribute name="key" type="xsd:string" />
-    <xsd:attribute name="on-invalid" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="call" mixed="true">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:element name="argument" type="argument" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="service" type="service" />
-    </xsd:choice>
-    <xsd:attribute name="method" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:simpleType name="parameter_type">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="collection" />
-      <xsd:enumeration value="service" />
-      <xsd:enumeration value="string" />
-      <xsd:enumeration value="constant" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="argument_type">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="collection" />
-      <xsd:enumeration value="service" />
-      <xsd:enumeration value="string" />
-      <xsd:enumeration value="constant" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="boolean">
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="(%.+%|true|false)" />
-    </xsd:restriction>
-  </xsd:simpleType>
-</xsd:schema>
diff --git a/src/Symfony/Components/DependencyInjection/Loader/schema/swiftmailer/swiftmailer-1.0.xsd b/src/Symfony/Components/DependencyInjection/Loader/schema/swiftmailer/swiftmailer-1.0.xsd
deleted file mode 100644
index 5514ddd523..0000000000
--- a/src/Symfony/Components/DependencyInjection/Loader/schema/swiftmailer/swiftmailer-1.0.xsd
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<xsd:schema xmlns="http://www.symfony-project.org/schema/swiftmailer"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.symfony-project.org/schema/swiftmailer"
-    elementFormDefault="qualified">
-
-  <xsd:element name="mailer" type="mailer" />
-
-  <xsd:complexType name="mailer">
-    <xsd:sequence>
-      <xsd:element name="username" type="xsd:string" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="password" type="xsd:string" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="host" type="xsd:string" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="port" type="xsd:string" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="encryption" type="encryption" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="auth_mode" type="auth_mode" minOccurs="0" maxOccurs="1" />
-
-      <xsd:element name="spool" type="spool" minOccurs="0" maxOccurs="1" />
-    </xsd:sequence>
-
-    <xsd:attribute name="transport" type="xsd:string" />
-    <xsd:attribute name="delivery_strategy" type="delivery_strategy" />
-  </xsd:complexType>
-
-  <xsd:complexType name="spool">
-    <xsd:attribute name="path" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:simpleType name="encryption">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="tls" />
-      <xsd:enumeration value="ssl" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="auth_mode">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="plain" />
-      <xsd:enumeration value="login" />
-      <xsd:enumeration value="cram-md5" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="delivery_strategy">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="realtime" />
-      <xsd:enumeration value="spool" />
-      <xsd:enumeration value="single_address" />
-      <xsd:enumeration value="none" />
-    </xsd:restriction>
-  </xsd:simpleType>
-</xsd:schema>
diff --git a/src/Symfony/Components/DependencyInjection/Loader/schema/symfony/symfony-1.0.xsd b/src/Symfony/Components/DependencyInjection/Loader/schema/symfony/symfony-1.0.xsd
deleted file mode 100644
index 6be5723320..0000000000
--- a/src/Symfony/Components/DependencyInjection/Loader/schema/symfony/symfony-1.0.xsd
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<xsd:schema xmlns="http://www.symfony-project.org/schema/symfony"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.symfony-project.org/schema/symfony"
-    elementFormDefault="qualified">
-
-  <xsd:element name="templating" type="templating" />
-
-  <xsd:complexType name="templating">
-    <xsd:sequence>
-      <xsd:element name="loader" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="helper" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-
-    <xsd:attribute name="path" type="xsd:string" />
-    <xsd:attribute name="cache" type="xsd:string" />
-  </xsd:complexType>
-</xsd:schema>
diff --git a/src/Symfony/Components/DependencyInjection/Loader/schema/zend/zend-1.0.xsd b/src/Symfony/Components/DependencyInjection/Loader/schema/zend/zend-1.0.xsd
deleted file mode 100644
index c8233b5aff..0000000000
--- a/src/Symfony/Components/DependencyInjection/Loader/schema/zend/zend-1.0.xsd
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<xsd:schema xmlns="http://www.symfony-project.org/schema/zend"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.symfony-project.org/schema/zend"
-    elementFormDefault="qualified">
-
-  <xsd:element name="logger" type="logger" />
-
-  <xsd:complexType name="logger">
-    <xsd:attribute name="priority" type="priority" />
-    <xsd:attribute name="path" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:simpleType name="priority">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="emerg" />
-      <xsd:enumeration value="alert" />
-      <xsd:enumeration value="crit" />
-      <xsd:enumeration value="err" />
-      <xsd:enumeration value="warn" />
-      <xsd:enumeration value="notice" />
-      <xsd:enumeration value="info" />
-      <xsd:enumeration value="debug" />
-
-      <xsd:enumeration value="0" />
-      <xsd:enumeration value="1" />
-      <xsd:enumeration value="2" />
-      <xsd:enumeration value="3" />
-      <xsd:enumeration value="4" />
-      <xsd:enumeration value="5" />
-      <xsd:enumeration value="6" />
-      <xsd:enumeration value="7" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:element name="mail" type="mail" />
-
-  <xsd:complexType name="mail">
-    <xsd:sequence>
-      <xsd:element name="username" type="xsd:string" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="password" type="xsd:string" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="host" type="xsd:string" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="port" type="xsd:string" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="ssl" type="ssl" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="auth" type="auth" minOccurs="0" maxOccurs="1" />
-    </xsd:sequence>
-
-    <xsd:attribute name="transport" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:simpleType name="auth">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="plain" />
-      <xsd:enumeration value="login" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="ssl">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="tls" />
-      <xsd:enumeration value="ssl" />
-    </xsd:restriction>
-  </xsd:simpleType>
-</xsd:schema>
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services1.xml b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services1.xml
index 7fed40e139..058d0f09f2 100644
--- a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services1.xml
+++ b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 
-<container xmlns="http://www.symfony-project.org/schema/services"
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.symfony-project.org/schema/services http://www.symfony-project.org/schema/services/services-1.0.xsd">
+    xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
 </container>
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services10.xml b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services10.xml
index da33906233..76db79e804 100644
--- a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services10.xml
+++ b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services10.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 
-<container xmlns="http://www.symfony-project.org/schema/services"
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
     xmlns:project="http://www.example.com/schema/project">
 
   <project:bar />
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services11.xml b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services11.xml
index 615efeae5f..69c46d7c00 100644
--- a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services11.xml
+++ b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services11.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 
-<container xmlns="http://www.symfony-project.org/schema/services"
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
     xmlns:foobar="http://www.example.com/schema/foobar">
 
   <foobar:foobar />
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services12.xml b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services12.xml
index 94ba0c6757..15cf73949b 100644
--- a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services12.xml
+++ b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services12.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 
-<container xmlns="http://www.symfony-project.org/schema/services"
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
     xmlns:project="http://www.example.com/schema/project">
 
   <foobar />
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services2.xml b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services2.xml
index 11031cadb0..947872d376 100644
--- a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services2.xml
+++ b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services2.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 
-<container xmlns="http://www.symfony-project.org/schema/services"
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.symfony-project.org/schema/services http://www.symfony-project.org/schema/services/services-1.0.xsd">
+    xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
   <parameters>
     <parameter>a string</parameter>
     <parameter key="FOO">bar</parameter>
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services3.xml b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services3.xml
index 16bfb721d3..af7d891f2e 100644
--- a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services3.xml
+++ b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services3.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 
-<container xmlns="http://www.symfony-project.org/schema/services"
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.symfony-project.org/schema/services http://www.symfony-project.org/schema/services/services-1.0.xsd">
+    xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
   <parameters>
     <parameter key="foo">foo</parameter>
     <parameter key="values" type="collection">
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services4.xml b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services4.xml
index 42f76abc31..ed9edfe902 100644
--- a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services4.xml
+++ b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services4.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 
-<container xmlns="http://www.symfony-project.org/schema/services"
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.symfony-project.org/schema/services http://www.symfony-project.org/schema/services/services-1.0.xsd">
+    xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
   <imports>
     <import resource="services2.xml" />
     <import resource="services3.xml" />
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services5.xml b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services5.xml
index f21ce2289d..ef560929cb 100644
--- a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services5.xml
+++ b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services5.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 
-<container xmlns="http://www.symfony-project.org/schema/services"
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.symfony-project.org/schema/services http://www.symfony-project.org/schema/services/services-1.0.xsd">
+    xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
   <services>
     <service id="foo" class="FooClass">
       <argument type="service">
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services6.xml b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services6.xml
index c14e21f477..3b7f9f278a 100644
--- a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services6.xml
+++ b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services6.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 
-<container xmlns="http://www.symfony-project.org/schema/services"
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.symfony-project.org/schema/services http://www.symfony-project.org/schema/services/services-1.0.xsd">
+    xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
   <services>
     <service id="foo" class="FooClass" />
     <service id="baz" class="BazClass" />
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services7.xml b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services7.xml
index 5387ff7f45..34fb25bd89 100644
--- a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services7.xml
+++ b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services7.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 
-<container xmlns="http://www.symfony-project.org/schema/services"
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.symfony-project.org/schema/services http://www.symfony-project.org/schema/services/services-1.0.xsd">
+    xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
   <services>
     <service id="foo" class="BarClass" />
   </services>
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services8.xml b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services8.xml
index ba3eeb36d6..59dba00c1d 100644
--- a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services8.xml
+++ b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services8.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 
-<container xmlns="http://www.symfony-project.org/schema/services"
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.symfony-project.org/schema/services http://www.symfony-project.org/schema/services/services-1.0.xsd">
+    xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
   <parameters>
     <parameter key="foo">bar</parameter>
     <parameter key="bar">foo is %%foo bar</parameter>
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services9.xml b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services9.xml
index 6973da85ca..fd1df2987b 100644
--- a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services9.xml
+++ b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services9.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 
-<container xmlns="http://www.symfony-project.org/schema/services"
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.symfony-project.org/schema/services http://www.symfony-project.org/schema/services/services-1.0.xsd">
+    xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
   <parameters>
     <parameter key="baz_class">BazClass</parameter>
     <parameter key="foo_class">FooClass</parameter>