From 99a63fe1a66c6cb80a3a74d17afc909fccfe790d Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 24 Jun 2010 07:49:27 +0200
Subject: [PATCH] renamed WebBundle to FoundationBundle as the bundle is not
 just about the web

---
 .../HttpKernel/Listener/ResponseFilter.php       |  2 +-
 .../Foundation/Bundle/KernelExtension.php        |  8 ++++----
 src/Symfony/Foundation/bootstrap.php             |  8 ++++----
 .../Command/CreateDatabaseDoctrineCommand.php    |  2 +-
 .../DoctrineBundle/Command/DoctrineCommand.php   |  4 ++--
 .../Command/DropDatabaseDoctrineCommand.php      |  2 +-
 .../Command/LoadDataFixturesDoctrineCommand.php  |  2 +-
 .../Controller/DoctrineController.php            |  2 +-
 .../Command/DoctrineCommand.php                  |  2 +-
 .../Command/AssetsInstallCommand.php             |  6 +++---
 .../Command/Command.php                          |  4 ++--
 .../Command/InitApplicationCommand.php           |  6 +++---
 .../Command/InitBundleCommand.php                |  8 ++++----
 .../Command/RouterApacheDumperCommand.php        |  4 ++--
 .../Command/RouterDebugCommand.php               |  4 ++--
 .../Console/Application.php                      |  4 ++--
 .../Console/BootstrapApplication.php             |  6 +++---
 .../Console/Shell.php                            |  4 ++--
 .../Controller.php                               |  6 +++---
 .../Controller/ControllerManager.php             |  4 ++--
 .../Controller/DefaultController.php             |  8 ++++----
 .../Controller/ExceptionController.php           | 10 +++++-----
 .../Controller/InternalController.php            |  6 +++---
 .../Controller/RedirectController.php            |  6 +++---
 .../Controller/TemplateController.php            |  6 +++---
 .../DataCollector/AppDataCollector.php           |  4 ++--
 .../DataCollector/ConfigDataCollector.php        |  4 ++--
 .../DataCollector/TimerDataCollector.php         |  4 ++--
 .../Debug/ExceptionFormatter.php                 |  4 ++--
 .../DependencyInjection/WebExtension.php         |  6 +++---
 .../FoundationBundle.php}                        |  8 ++++----
 .../Helper/ActionsHelper.php                     |  8 ++++----
 .../Helper/RequestHelper.php                     |  4 ++--
 .../Helper/RouterHelper.php                      |  4 ++--
 .../Helper/UserHelper.php                        |  6 +++---
 .../Listener/ControllerLoader.php                |  6 +++---
 .../Listener/ExceptionHandler.php                |  4 ++--
 .../Listener/RequestParser.php                   |  4 ++--
 .../{WebBundle => FoundationBundle}/Profiler.php |  4 ++--
 .../Resources/config/debug.xml                   |  2 +-
 .../Resources/config/default_routing.xml         |  0
 .../Resources/config/internal_routing.xml        |  2 +-
 .../Resources/config/pdo.xml                     |  0
 .../Resources/config/profiling.xml               |  8 ++++----
 .../config/schema/dic/symfony/symfony-1.0.xsd    |  0
 .../Resources/config/templating.xml              | 10 +++++-----
 .../Resources/config/toolbar.xml                 |  0
 .../Resources/config/user.xml                    |  6 +++---
 .../Resources/config/web.xml                     | 10 +++++-----
 .../Resources/skeleton/application/xml/Cache.php |  0
 .../skeleton/application/xml/Kernel.php          | 16 +++++++++++-----
 .../skeleton/application/xml/cache/.symfony      |  0
 .../skeleton/application/xml/config/config.xml   |  0
 .../application/xml/config/config_dev.xml        |  0
 .../application/xml/config/config_prod.xml       |  0
 .../application/xml/config/config_test.xml       |  0
 .../skeleton/application/xml/config/routing.xml  |  2 +-
 .../Resources/skeleton/application/xml}/console  |  2 +-
 .../skeleton/application/xml/logs/.symfony       |  0
 .../skeleton/application/xml/phpunit.xml.dist    |  0
 .../skeleton/application/yaml/Cache.php          |  0
 .../skeleton/application/yaml/Kernel.php         | 16 +++++++++++-----
 .../skeleton/application/yaml/cache/.symfony     |  0
 .../skeleton/application/yaml/config/config.yml  |  0
 .../application/yaml/config/config_dev.yml       |  0
 .../application/yaml/config/config_prod.yml      |  0
 .../application/yaml/config/config_test.yml      |  0
 .../skeleton/application/yaml/config/routing.yml |  3 +++
 .../Resources/skeleton/application/yaml}/console |  2 +-
 .../skeleton/application/yaml/logs/.symfony      |  0
 .../skeleton/application/yaml/phpunit.xml.dist   |  0
 .../Resources/skeleton/bundle/Bundle.php         |  0
 .../skeleton/bundle/Controller/.symfony          |  0
 .../bundle/Controller/DefaultController.php      |  2 +-
 .../skeleton/bundle/Resources/config/routing.xml |  0
 .../skeleton/bundle/Resources/views/.symfony     |  0
 .../bundle/Resources/views/Default/index.php     |  0
 .../Resources/skeleton/web/front_controller.php  |  0
 .../skeleton/web/front_controller_debug.php      |  0
 .../Resources/views/Default/index.php            |  0
 .../Resources/views/Exception/error.atom.php     |  0
 .../Resources/views/Exception/error.css.php      |  0
 .../Resources/views/Exception/error.html.php     |  0
 .../Resources/views/Exception/error.js.php       |  0
 .../Resources/views/Exception/error.json.php     |  0
 .../Resources/views/Exception/error.rdf.php      |  0
 .../Resources/views/Exception/error.txt.php      |  0
 .../Resources/views/Exception/error.xml.php      |  0
 .../Resources/views/Exception/exception.atom.php |  0
 .../Resources/views/Exception/exception.css.php  |  0
 .../Resources/views/Exception/exception.html.php |  0
 .../Resources/views/Exception/exception.js.php   |  0
 .../Resources/views/Exception/exception.json.php |  0
 .../Resources/views/Exception/exception.rdf.php  |  0
 .../Resources/views/Exception/exception.txt.php  |  0
 .../Resources/views/Exception/exception.xml.php  |  0
 .../Session/NativeSession.php                    |  4 ++--
 .../Session/PdoSession.php                       |  4 ++--
 .../Session/SessionInterface.php                 |  4 ++--
 .../Templating/Debugger.php                      |  4 ++--
 .../Templating/Engine.php                        |  4 ++--
 .../Test/WebTestCase.php                         |  4 ++--
 .../DependencyInjection/WebExtensionTest.php     | 14 +++++++-------
 .../Tests/TestCase.php                           |  2 +-
 .../Tests/Util/MustacheTest.php                  |  8 ++++----
 .../Tests/Util/fixtures/foo/bar.txt              |  0
 .../Tests/Util/fixtures/foo/bar/foo.txt          |  0
 .../Tests/Util/fixtures/template.txt             |  0
 .../{WebBundle => FoundationBundle}/User.php     |  6 +++---
 .../Util/Filesystem.php                          |  4 ++--
 .../Util/Mustache.php                            |  4 ++--
 .../PropelBundle/Command/BuildSqlCommand.php     |  2 +-
 .../PropelBundle/Command/PhingCommand.php        |  2 +-
 .../skeleton/application/yaml/config/routing.yml |  3 ---
 114 files changed, 178 insertions(+), 166 deletions(-)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Command/AssetsInstallCommand.php (93%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Command/Command.php (90%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Command/InitApplicationCommand.php (94%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Command/InitBundleCommand.php (92%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Command/RouterApacheDumperCommand.php (92%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Command/RouterDebugCommand.php (98%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Console/Application.php (95%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Console/BootstrapApplication.php (84%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Console/Shell.php (92%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Controller.php (95%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Controller/ControllerManager.php (98%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Controller/DefaultController.php (68%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Controller/ExceptionController.php (90%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Controller/InternalController.php (84%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Controller/RedirectController.php (88%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Controller/TemplateController.php (77%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/DataCollector/AppDataCollector.php (96%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/DataCollector/ConfigDataCollector.php (98%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/DataCollector/TimerDataCollector.php (94%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Debug/ExceptionFormatter.php (98%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/DependencyInjection/WebExtension.php (97%)
 rename src/Symfony/Framework/{WebBundle/WebBundle.php => FoundationBundle/FoundationBundle.php} (89%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Helper/ActionsHelper.php (88%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Helper/RequestHelper.php (91%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Helper/RouterHelper.php (93%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Helper/UserHelper.php (91%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Listener/ControllerLoader.php (92%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Listener/ExceptionHandler.php (96%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Listener/RequestParser.php (96%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Profiler.php (95%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/config/debug.xml (91%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/config/default_routing.xml (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/config/internal_routing.xml (83%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/config/pdo.xml (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/config/profiling.xml (89%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/config/schema/dic/symfony/symfony-1.0.xsd (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/config/templating.xml (94%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/config/toolbar.xml (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/config/user.xml (92%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/config/web.xml (90%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/application/xml/Cache.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/application/xml/Kernel.php (75%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/application/xml/cache/.symfony (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/application/xml/config/config.xml (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/application/xml/config/config_dev.xml (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/application/xml/config/config_prod.xml (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/application/xml/config/config_test.xml (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/application/xml/config/routing.xml (82%)
 rename src/Symfony/Framework/{WebBundle/Resources/skeleton/application/yaml => FoundationBundle/Resources/skeleton/application/xml}/console (75%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/application/xml/logs/.symfony (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/application/xml/phpunit.xml.dist (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/application/yaml/Cache.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/application/yaml/Kernel.php (75%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/application/yaml/cache/.symfony (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/application/yaml/config/config.yml (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/application/yaml/config/config_dev.yml (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/application/yaml/config/config_prod.yml (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/application/yaml/config/config_test.yml (100%)
 create mode 100644 src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/config/routing.yml
 rename src/Symfony/Framework/{WebBundle/Resources/skeleton/application/xml => FoundationBundle/Resources/skeleton/application/yaml}/console (75%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/application/yaml/logs/.symfony (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/application/yaml/phpunit.xml.dist (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/bundle/Bundle.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/bundle/Controller/.symfony (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/bundle/Controller/DefaultController.php (80%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/bundle/Resources/config/routing.xml (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/bundle/Resources/views/.symfony (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/bundle/Resources/views/Default/index.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/web/front_controller.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/skeleton/web/front_controller_debug.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/views/Default/index.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/views/Exception/error.atom.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/views/Exception/error.css.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/views/Exception/error.html.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/views/Exception/error.js.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/views/Exception/error.json.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/views/Exception/error.rdf.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/views/Exception/error.txt.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/views/Exception/error.xml.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/views/Exception/exception.atom.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/views/Exception/exception.css.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/views/Exception/exception.html.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/views/Exception/exception.js.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/views/Exception/exception.json.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/views/Exception/exception.rdf.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/views/Exception/exception.txt.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Resources/views/Exception/exception.xml.php (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Session/NativeSession.php (98%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Session/PdoSession.php (98%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Session/SessionInterface.php (95%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Templating/Debugger.php (91%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Templating/Engine.php (97%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Test/WebTestCase.php (96%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Tests/DependencyInjection/WebExtensionTest.php (61%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Tests/TestCase.php (85%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Tests/Util/MustacheTest.php (87%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Tests/Util/fixtures/foo/bar.txt (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Tests/Util/fixtures/foo/bar/foo.txt (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Tests/Util/fixtures/template.txt (100%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/User.php (95%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Util/Filesystem.php (98%)
 rename src/Symfony/Framework/{WebBundle => FoundationBundle}/Util/Mustache.php (92%)
 delete mode 100644 src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/config/routing.yml

diff --git a/src/Symfony/Components/HttpKernel/Listener/ResponseFilter.php b/src/Symfony/Components/HttpKernel/Listener/ResponseFilter.php
index 598460d4f2..e8c6ccd45f 100644
--- a/src/Symfony/Components/HttpKernel/Listener/ResponseFilter.php
+++ b/src/Symfony/Components/HttpKernel/Listener/ResponseFilter.php
@@ -20,7 +20,7 @@ use Symfony\Components\HttpKernel\HttpKernelInterface;
  * ResponseFilter.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_HttpKernel
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class ResponseFilter
diff --git a/src/Symfony/Foundation/Bundle/KernelExtension.php b/src/Symfony/Foundation/Bundle/KernelExtension.php
index ced2d84300..2359cc63d5 100644
--- a/src/Symfony/Foundation/Bundle/KernelExtension.php
+++ b/src/Symfony/Foundation/Bundle/KernelExtension.php
@@ -63,10 +63,10 @@ class KernelExtension extends LoaderExtension
                 'Symfony\\Components\\Templating\\Renderer\\PhpRenderer',
                 'Symfony\\Components\\Templating\\Storage\\Storage',
                 'Symfony\\Components\\Templating\\Storage\\FileStorage',
-                'Symfony\\Framework\\WebBundle\\Controller',
-                'Symfony\\Framework\\WebBundle\\Listener\\RequestParser',
-                'Symfony\\Framework\\WebBundle\\Listener\\ControllerLoader',
-                'Symfony\\Framework\\WebBundle\\Templating\\Engine',
+                'Symfony\\Framework\\FoundationBundle\\Controller',
+                'Symfony\\Framework\\FoundationBundle\\Listener\\RequestParser',
+                'Symfony\\Framework\\FoundationBundle\\Listener\\ControllerLoader',
+                'Symfony\\Framework\\FoundationBundle\\Templating\\Engine',
             );
         } else {
             $classes = array();
diff --git a/src/Symfony/Foundation/bootstrap.php b/src/Symfony/Foundation/bootstrap.php
index 0c2bd34f6d..e7d982cf14 100644
--- a/src/Symfony/Foundation/bootstrap.php
+++ b/src/Symfony/Foundation/bootstrap.php
@@ -221,10 +221,10 @@ class KernelExtension extends LoaderExtension
                 'Symfony\\Components\\Templating\\Renderer\\PhpRenderer',
                 'Symfony\\Components\\Templating\\Storage\\Storage',
                 'Symfony\\Components\\Templating\\Storage\\FileStorage',
-                'Symfony\\Framework\\WebBundle\\Controller',
-                'Symfony\\Framework\\WebBundle\\Listener\\RequestParser',
-                'Symfony\\Framework\\WebBundle\\Listener\\ControllerLoader',
-                'Symfony\\Framework\\WebBundle\\Templating\\Engine',
+                'Symfony\\Framework\\FoundationBundle\\Controller',
+                'Symfony\\Framework\\FoundationBundle\\Listener\\RequestParser',
+                'Symfony\\Framework\\FoundationBundle\\Listener\\ControllerLoader',
+                'Symfony\\Framework\\FoundationBundle\\Templating\\Engine',
             );
         } else {
             $classes = array();
diff --git a/src/Symfony/Framework/DoctrineBundle/Command/CreateDatabaseDoctrineCommand.php b/src/Symfony/Framework/DoctrineBundle/Command/CreateDatabaseDoctrineCommand.php
index 2389335e25..ffae8e856e 100644
--- a/src/Symfony/Framework/DoctrineBundle/Command/CreateDatabaseDoctrineCommand.php
+++ b/src/Symfony/Framework/DoctrineBundle/Command/CreateDatabaseDoctrineCommand.php
@@ -7,7 +7,7 @@ use Symfony\Components\Console\Input\InputOption;
 use Symfony\Components\Console\Input\InputInterface;
 use Symfony\Components\Console\Output\OutputInterface;
 use Symfony\Components\Console\Output\Output;
-use Symfony\Framework\WebBundle\Util\Filesystem;
+use Symfony\Framework\FoundationBundle\Util\Filesystem;
 use Doctrine\Common\Cli\Configuration;
 use Doctrine\Common\Cli\CliController as DoctrineCliController;
 use Doctrine\DBAL\Connection;
diff --git a/src/Symfony/Framework/DoctrineBundle/Command/DoctrineCommand.php b/src/Symfony/Framework/DoctrineBundle/Command/DoctrineCommand.php
index 14801758ce..4f83b77571 100644
--- a/src/Symfony/Framework/DoctrineBundle/Command/DoctrineCommand.php
+++ b/src/Symfony/Framework/DoctrineBundle/Command/DoctrineCommand.php
@@ -2,14 +2,14 @@
 
 namespace Symfony\Framework\DoctrineBundle\Command;
 
-use Symfony\Framework\WebBundle\Command\Command;
+use Symfony\Framework\FoundationBundle\Command\Command;
 use Symfony\Components\Console\Input\ArrayInput;
 use Symfony\Components\Console\Input\InputArgument;
 use Symfony\Components\Console\Input\InputOption;
 use Symfony\Components\Console\Input\InputInterface;
 use Symfony\Components\Console\Output\OutputInterface;
 use Symfony\Components\Console\Output\Output;
-use Symfony\Framework\WebBundle\Console\Application;
+use Symfony\Framework\FoundationBundle\Console\Application;
 use Symfony\Foundation\Bundle\Bundle;
 use Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper;
 use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper;
diff --git a/src/Symfony/Framework/DoctrineBundle/Command/DropDatabaseDoctrineCommand.php b/src/Symfony/Framework/DoctrineBundle/Command/DropDatabaseDoctrineCommand.php
index ba2a315ae2..4a254f92f0 100644
--- a/src/Symfony/Framework/DoctrineBundle/Command/DropDatabaseDoctrineCommand.php
+++ b/src/Symfony/Framework/DoctrineBundle/Command/DropDatabaseDoctrineCommand.php
@@ -7,7 +7,7 @@ use Symfony\Components\Console\Input\InputOption;
 use Symfony\Components\Console\Input\InputInterface;
 use Symfony\Components\Console\Output\OutputInterface;
 use Symfony\Components\Console\Output\Output;
-use Symfony\Framework\WebBundle\Util\Filesystem;
+use Symfony\Framework\FoundationBundle\Util\Filesystem;
 use Doctrine\Common\Cli\Configuration;
 use Doctrine\Common\Cli\CliController as DoctrineCliController;
 use Doctrine\DBAL\Connection;
diff --git a/src/Symfony/Framework/DoctrineBundle/Command/LoadDataFixturesDoctrineCommand.php b/src/Symfony/Framework/DoctrineBundle/Command/LoadDataFixturesDoctrineCommand.php
index d62a9756d2..1899cf976a 100644
--- a/src/Symfony/Framework/DoctrineBundle/Command/LoadDataFixturesDoctrineCommand.php
+++ b/src/Symfony/Framework/DoctrineBundle/Command/LoadDataFixturesDoctrineCommand.php
@@ -8,7 +8,7 @@ use Symfony\Components\Console\Input\InputInterface;
 use Symfony\Components\Console\Output\OutputInterface;
 use Symfony\Components\Console\Output\Output;
 use Symfony\Components\Finder\Finder;
-use Symfony\Framework\WebBundle\Util\Filesystem;
+use Symfony\Framework\FoundationBundle\Util\Filesystem;
 use Doctrine\Common\Cli\Configuration;
 use Doctrine\Common\Cli\CliController as DoctrineCliController;
 use Doctrine\ORM\EntityManager;
diff --git a/src/Symfony/Framework/DoctrineBundle/Controller/DoctrineController.php b/src/Symfony/Framework/DoctrineBundle/Controller/DoctrineController.php
index 6333f6a546..f2331c2527 100644
--- a/src/Symfony/Framework/DoctrineBundle/Controller/DoctrineController.php
+++ b/src/Symfony/Framework/DoctrineBundle/Controller/DoctrineController.php
@@ -2,7 +2,7 @@
 
 namespace Symfony\Framework\DoctrineBundle\Controller;
 
-use Symfony\Framework\WebBundle\Controller;
+use Symfony\Framework\FoundationBundle\Controller;
 
 /*
  * This file is part of the Symfony framework.
diff --git a/src/Symfony/Framework/DoctrineMigrationsBundle/Command/DoctrineCommand.php b/src/Symfony/Framework/DoctrineMigrationsBundle/Command/DoctrineCommand.php
index 31c8c49d50..b5e18648b8 100644
--- a/src/Symfony/Framework/DoctrineMigrationsBundle/Command/DoctrineCommand.php
+++ b/src/Symfony/Framework/DoctrineMigrationsBundle/Command/DoctrineCommand.php
@@ -2,7 +2,7 @@
 
 namespace Symfony\Framework\DoctrineMigrationsBundle\Command;
 
-use Symfony\Framework\WebBundle\Console\Application;
+use Symfony\Framework\FoundationBundle\Console\Application;
 use Symfony\Framework\DoctrineBundle\Command\DoctrineCommand as BaseCommand;
 use Doctrine\DBAL\Migrations\Configuration\Configuration;
 use Doctrine\Common\Util\Inflector;
diff --git a/src/Symfony/Framework/WebBundle/Command/AssetsInstallCommand.php b/src/Symfony/Framework/FoundationBundle/Command/AssetsInstallCommand.php
similarity index 93%
rename from src/Symfony/Framework/WebBundle/Command/AssetsInstallCommand.php
rename to src/Symfony/Framework/FoundationBundle/Command/AssetsInstallCommand.php
index 684a0f48eb..b81d4f0fa8 100644
--- a/src/Symfony/Framework/WebBundle/Command/AssetsInstallCommand.php
+++ b/src/Symfony/Framework/FoundationBundle/Command/AssetsInstallCommand.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Command;
+namespace Symfony\Framework\FoundationBundle\Command;
 
 use Symfony\Components\Console\Input\InputArgument;
 use Symfony\Components\Console\Input\InputOption;
 use Symfony\Components\Console\Input\InputInterface;
 use Symfony\Components\Console\Output\OutputInterface;
 use Symfony\Components\Console\Output\Output;
-use Symfony\Framework\WebBundle\Util\Filesystem;
+use Symfony\Framework\FoundationBundle\Util\Filesystem;
 
 /*
  * This file is part of the Symfony framework.
@@ -22,7 +22,7 @@ use Symfony\Framework\WebBundle\Util\Filesystem;
  * AssetsInstallCommand.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class AssetsInstallCommand extends Command
diff --git a/src/Symfony/Framework/WebBundle/Command/Command.php b/src/Symfony/Framework/FoundationBundle/Command/Command.php
similarity index 90%
rename from src/Symfony/Framework/WebBundle/Command/Command.php
rename to src/Symfony/Framework/FoundationBundle/Command/Command.php
index ffb659a076..d017fa6dbb 100644
--- a/src/Symfony/Framework/WebBundle/Command/Command.php
+++ b/src/Symfony/Framework/FoundationBundle/Command/Command.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Command;
+namespace Symfony\Framework\FoundationBundle\Command;
 
 use Symfony\Components\Console\Input\InputArgument;
 use Symfony\Components\Console\Input\InputOption;
@@ -22,7 +22,7 @@ use Symfony\Components\Console\Command\Command as BaseCommand;
  * Command.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 abstract class Command extends BaseCommand
diff --git a/src/Symfony/Framework/WebBundle/Command/InitApplicationCommand.php b/src/Symfony/Framework/FoundationBundle/Command/InitApplicationCommand.php
similarity index 94%
rename from src/Symfony/Framework/WebBundle/Command/InitApplicationCommand.php
rename to src/Symfony/Framework/FoundationBundle/Command/InitApplicationCommand.php
index 1cf9b463ed..a12be70470 100644
--- a/src/Symfony/Framework/WebBundle/Command/InitApplicationCommand.php
+++ b/src/Symfony/Framework/FoundationBundle/Command/InitApplicationCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Command;
+namespace Symfony\Framework\FoundationBundle\Command;
 
 use Symfony\Components\Console\Command\Command as BaseCommand;
 use Symfony\Components\Console\Input\InputArgument;
@@ -8,8 +8,8 @@ use Symfony\Components\Console\Input\InputOption;
 use Symfony\Components\Console\Input\InputInterface;
 use Symfony\Components\Console\Output\OutputInterface;
 use Symfony\Components\Console\Output\Output;
-use Symfony\Framework\WebBundle\Util\Filesystem;
-use Symfony\Framework\WebBundle\Util\Mustache;
+use Symfony\Framework\FoundationBundle\Util\Filesystem;
+use Symfony\Framework\FoundationBundle\Util\Mustache;
 
 /*
  * This file is part of the symfony framework.
diff --git a/src/Symfony/Framework/WebBundle/Command/InitBundleCommand.php b/src/Symfony/Framework/FoundationBundle/Command/InitBundleCommand.php
similarity index 92%
rename from src/Symfony/Framework/WebBundle/Command/InitBundleCommand.php
rename to src/Symfony/Framework/FoundationBundle/Command/InitBundleCommand.php
index 03e94652d0..be27aca4b1 100644
--- a/src/Symfony/Framework/WebBundle/Command/InitBundleCommand.php
+++ b/src/Symfony/Framework/FoundationBundle/Command/InitBundleCommand.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Command;
+namespace Symfony\Framework\FoundationBundle\Command;
 
 use Symfony\Components\Console\Input\InputArgument;
 use Symfony\Components\Console\Input\InputOption;
 use Symfony\Components\Console\Input\InputInterface;
 use Symfony\Components\Console\Output\OutputInterface;
 use Symfony\Components\Console\Output\Output;
-use Symfony\Framework\WebBundle\Util\Filesystem;
-use Symfony\Framework\WebBundle\Util\Mustache;
+use Symfony\Framework\FoundationBundle\Util\Filesystem;
+use Symfony\Framework\FoundationBundle\Util\Mustache;
 
 /*
  * This file is part of the Symfony framework.
@@ -23,7 +23,7 @@ use Symfony\Framework\WebBundle\Util\Mustache;
  * Initializes a new bundle.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class InitBundleCommand extends Command
diff --git a/src/Symfony/Framework/WebBundle/Command/RouterApacheDumperCommand.php b/src/Symfony/Framework/FoundationBundle/Command/RouterApacheDumperCommand.php
similarity index 92%
rename from src/Symfony/Framework/WebBundle/Command/RouterApacheDumperCommand.php
rename to src/Symfony/Framework/FoundationBundle/Command/RouterApacheDumperCommand.php
index e950b1ad73..836b7416bc 100644
--- a/src/Symfony/Framework/WebBundle/Command/RouterApacheDumperCommand.php
+++ b/src/Symfony/Framework/FoundationBundle/Command/RouterApacheDumperCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Command;
+namespace Symfony\Framework\FoundationBundle\Command;
 
 use Symfony\Components\Console\Input\InputArgument;
 use Symfony\Components\Console\Input\InputOption;
@@ -22,7 +22,7 @@ use Symfony\Components\Routing\Matcher\Dumper\ApacheMatcherDumper;
  * RouterApacheDumperCommand.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class RouterApacheDumperCommand extends Command
diff --git a/src/Symfony/Framework/WebBundle/Command/RouterDebugCommand.php b/src/Symfony/Framework/FoundationBundle/Command/RouterDebugCommand.php
similarity index 98%
rename from src/Symfony/Framework/WebBundle/Command/RouterDebugCommand.php
rename to src/Symfony/Framework/FoundationBundle/Command/RouterDebugCommand.php
index 42269995aa..57268d2712 100644
--- a/src/Symfony/Framework/WebBundle/Command/RouterDebugCommand.php
+++ b/src/Symfony/Framework/FoundationBundle/Command/RouterDebugCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Command;
+namespace Symfony\Framework\FoundationBundle\Command;
 
 use Symfony\Components\Console\Input\InputArgument;
 use Symfony\Components\Console\Input\InputOption;
@@ -22,7 +22,7 @@ use Symfony\Components\Routing\Matcher\Dumper\ApacheMatcherDumper;
  * RouterDebugCommand.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class RouterDebugCommand extends Command
diff --git a/src/Symfony/Framework/WebBundle/Console/Application.php b/src/Symfony/Framework/FoundationBundle/Console/Application.php
similarity index 95%
rename from src/Symfony/Framework/WebBundle/Console/Application.php
rename to src/Symfony/Framework/FoundationBundle/Console/Application.php
index 83adab905d..fed4c3fdcc 100644
--- a/src/Symfony/Framework/WebBundle/Console/Application.php
+++ b/src/Symfony/Framework/FoundationBundle/Console/Application.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Console;
+namespace Symfony\Framework\FoundationBundle\Console;
 
 use Symfony\Components\Console\Application as BaseApplication;
 use Symfony\Components\Console\Input\InputInterface;
@@ -21,7 +21,7 @@ use Symfony\Foundation\Kernel;
  * Application.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class Application extends BaseApplication
diff --git a/src/Symfony/Framework/WebBundle/Console/BootstrapApplication.php b/src/Symfony/Framework/FoundationBundle/Console/BootstrapApplication.php
similarity index 84%
rename from src/Symfony/Framework/WebBundle/Console/BootstrapApplication.php
rename to src/Symfony/Framework/FoundationBundle/Console/BootstrapApplication.php
index 1ded47a479..4d32a11e70 100644
--- a/src/Symfony/Framework/WebBundle/Console/BootstrapApplication.php
+++ b/src/Symfony/Framework/FoundationBundle/Console/BootstrapApplication.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Console;
+namespace Symfony\Framework\FoundationBundle\Console;
 
 use Symfony\Components\Console\Application as BaseApplication;
 use Symfony\Components\Console\Input\InputInterface;
 use Symfony\Components\Console\Input\InputOption;
 use Symfony\Components\Console\Output\OutputInterface;
 use Symfony\Foundation\Kernel;
-use Symfony\Framework\WebBundle\Command\InitApplicationCommand;
+use Symfony\Framework\FoundationBundle\Command\InitApplicationCommand;
 
 /*
  * This file is part of the Symfony framework.
@@ -22,7 +22,7 @@ use Symfony\Framework\WebBundle\Command\InitApplicationCommand;
  * BootstrapApplication.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class BootstrapApplication extends BaseApplication
diff --git a/src/Symfony/Framework/WebBundle/Console/Shell.php b/src/Symfony/Framework/FoundationBundle/Console/Shell.php
similarity index 92%
rename from src/Symfony/Framework/WebBundle/Console/Shell.php
rename to src/Symfony/Framework/FoundationBundle/Console/Shell.php
index 33ffb59e9f..fdb704ebde 100644
--- a/src/Symfony/Framework/WebBundle/Console/Shell.php
+++ b/src/Symfony/Framework/FoundationBundle/Console/Shell.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Console;
+namespace Symfony\Framework\FoundationBundle\Console;
 
 use Symfony\Components\Console\Shell as BaseShell;
 
@@ -17,7 +17,7 @@ use Symfony\Components\Console\Shell as BaseShell;
  * Shell.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class Shell extends BaseShell
diff --git a/src/Symfony/Framework/WebBundle/Controller.php b/src/Symfony/Framework/FoundationBundle/Controller.php
similarity index 95%
rename from src/Symfony/Framework/WebBundle/Controller.php
rename to src/Symfony/Framework/FoundationBundle/Controller.php
index 68b4b50845..f98583ea67 100644
--- a/src/Symfony/Framework/WebBundle/Controller.php
+++ b/src/Symfony/Framework/FoundationBundle/Controller.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle;
+namespace Symfony\Framework\FoundationBundle;
 
 use Symfony\Components\DependencyInjection\ContainerInterface;
 use Symfony\Components\HttpKernel\Request;
@@ -17,10 +17,10 @@ use Symfony\Components\HttpKernel\HttpKernelInterface;
  */
 
 /**
- * WebBundle Controller gives you convenient access to all commonly needed services.
+ * FoundationBundle Controller gives you convenient access to all commonly needed services.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class Controller
diff --git a/src/Symfony/Framework/WebBundle/Controller/ControllerManager.php b/src/Symfony/Framework/FoundationBundle/Controller/ControllerManager.php
similarity index 98%
rename from src/Symfony/Framework/WebBundle/Controller/ControllerManager.php
rename to src/Symfony/Framework/FoundationBundle/Controller/ControllerManager.php
index 07672b8e77..679d5b39db 100644
--- a/src/Symfony/Framework/WebBundle/Controller/ControllerManager.php
+++ b/src/Symfony/Framework/FoundationBundle/Controller/ControllerManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Controller;
+namespace Symfony\Framework\FoundationBundle\Controller;
 
 use Symfony\Components\HttpKernel\LoggerInterface;
 use Symfony\Components\DependencyInjection\ContainerInterface;
@@ -20,7 +20,7 @@ use Symfony\Components\HttpKernel\Request;
  * ControllerManager.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class ControllerManager
diff --git a/src/Symfony/Framework/WebBundle/Controller/DefaultController.php b/src/Symfony/Framework/FoundationBundle/Controller/DefaultController.php
similarity index 68%
rename from src/Symfony/Framework/WebBundle/Controller/DefaultController.php
rename to src/Symfony/Framework/FoundationBundle/Controller/DefaultController.php
index 03cbf5c1dc..d0b6ed8fc3 100644
--- a/src/Symfony/Framework/WebBundle/Controller/DefaultController.php
+++ b/src/Symfony/Framework/FoundationBundle/Controller/DefaultController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Controller;
+namespace Symfony\Framework\FoundationBundle\Controller;
 
-use Symfony\Framework\WebBundle\Controller;
+use Symfony\Framework\FoundationBundle\Controller;
 
 /*
  * This file is part of the Symfony framework.
@@ -17,13 +17,13 @@ use Symfony\Framework\WebBundle\Controller;
  * DefaultController.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class DefaultController extends Controller
 {
     public function indexAction()
     {
-        return $this->render('WebBundle:Default:index');
+        return $this->render('FoundationBundle:Default:index');
     }
 }
diff --git a/src/Symfony/Framework/WebBundle/Controller/ExceptionController.php b/src/Symfony/Framework/FoundationBundle/Controller/ExceptionController.php
similarity index 90%
rename from src/Symfony/Framework/WebBundle/Controller/ExceptionController.php
rename to src/Symfony/Framework/FoundationBundle/Controller/ExceptionController.php
index aef05d5129..af160049fa 100644
--- a/src/Symfony/Framework/WebBundle/Controller/ExceptionController.php
+++ b/src/Symfony/Framework/FoundationBundle/Controller/ExceptionController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Controller;
+namespace Symfony\Framework\FoundationBundle\Controller;
 
-use Symfony\Framework\WebBundle\Controller;
-use Symfony\Framework\WebBundle\Debug\ExceptionFormatter;
+use Symfony\Framework\FoundationBundle\Controller;
+use Symfony\Framework\FoundationBundle\Debug\ExceptionFormatter;
 use Symfony\Components\HttpKernel\Request;
 use Symfony\Components\HttpKernel\Response;
 use Symfony\Components\HttpKernel\Exception\HttpException;
@@ -21,7 +21,7 @@ use Symfony\Components\HttpKernel\Exception\HttpException;
  * ExceptionController.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class ExceptionController extends Controller
@@ -42,7 +42,7 @@ class ExceptionController extends Controller
         }
 
         $template = $this->container->getTemplatingService()->getLoader()->load($template, array(
-            'bundle'     => 'WebBundle',
+            'bundle'     => 'FoundationBundle',
             'controller' => 'Exception',
             'format'     => '.'.$format,
         ));
diff --git a/src/Symfony/Framework/WebBundle/Controller/InternalController.php b/src/Symfony/Framework/FoundationBundle/Controller/InternalController.php
similarity index 84%
rename from src/Symfony/Framework/WebBundle/Controller/InternalController.php
rename to src/Symfony/Framework/FoundationBundle/Controller/InternalController.php
index c70744c432..dc71557555 100644
--- a/src/Symfony/Framework/WebBundle/Controller/InternalController.php
+++ b/src/Symfony/Framework/FoundationBundle/Controller/InternalController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Controller;
+namespace Symfony\Framework\FoundationBundle\Controller;
 
-use Symfony\Framework\WebBundle\Controller;
+use Symfony\Framework\FoundationBundle\Controller;
 
 /*
  * This file is part of the Symfony framework.
@@ -17,7 +17,7 @@ use Symfony\Framework\WebBundle\Controller;
  * InternalController.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class InternalController extends Controller
diff --git a/src/Symfony/Framework/WebBundle/Controller/RedirectController.php b/src/Symfony/Framework/FoundationBundle/Controller/RedirectController.php
similarity index 88%
rename from src/Symfony/Framework/WebBundle/Controller/RedirectController.php
rename to src/Symfony/Framework/FoundationBundle/Controller/RedirectController.php
index d2502d8927..7d26bd80b7 100644
--- a/src/Symfony/Framework/WebBundle/Controller/RedirectController.php
+++ b/src/Symfony/Framework/FoundationBundle/Controller/RedirectController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Controller;
+namespace Symfony\Framework\FoundationBundle\Controller;
 
-use Symfony\Framework\WebBundle\Controller;
+use Symfony\Framework\FoundationBundle\Controller;
 
 /*
  * This file is part of the Symfony framework.
@@ -17,7 +17,7 @@ use Symfony\Framework\WebBundle\Controller;
  *
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class RedirectController extends Controller
diff --git a/src/Symfony/Framework/WebBundle/Controller/TemplateController.php b/src/Symfony/Framework/FoundationBundle/Controller/TemplateController.php
similarity index 77%
rename from src/Symfony/Framework/WebBundle/Controller/TemplateController.php
rename to src/Symfony/Framework/FoundationBundle/Controller/TemplateController.php
index 771fcb37fe..ccb8dfd798 100644
--- a/src/Symfony/Framework/WebBundle/Controller/TemplateController.php
+++ b/src/Symfony/Framework/FoundationBundle/Controller/TemplateController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Controller;
+namespace Symfony\Framework\FoundationBundle\Controller;
 
-use Symfony\Framework\WebBundle\Controller;
+use Symfony\Framework\FoundationBundle\Controller;
 
 /*
  * This file is part of the Symfony framework.
@@ -17,7 +17,7 @@ use Symfony\Framework\WebBundle\Controller;
  * TemplateController.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class TemplateController extends Controller
diff --git a/src/Symfony/Framework/WebBundle/DataCollector/AppDataCollector.php b/src/Symfony/Framework/FoundationBundle/DataCollector/AppDataCollector.php
similarity index 96%
rename from src/Symfony/Framework/WebBundle/DataCollector/AppDataCollector.php
rename to src/Symfony/Framework/FoundationBundle/DataCollector/AppDataCollector.php
index 94660fb75c..3830b72fa9 100644
--- a/src/Symfony/Framework/WebBundle/DataCollector/AppDataCollector.php
+++ b/src/Symfony/Framework/FoundationBundle/DataCollector/AppDataCollector.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\DataCollector;
+namespace Symfony\Framework\FoundationBundle\DataCollector;
 
 use Symfony\Components\HttpKernel\Profiler\DataCollector\DataCollector;
 use Symfony\Components\DependencyInjection\ContainerInterface;
@@ -18,7 +18,7 @@ use Symfony\Components\DependencyInjection\ContainerInterface;
  * AppDataCollector.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class AppDataCollector extends DataCollector
diff --git a/src/Symfony/Framework/WebBundle/DataCollector/ConfigDataCollector.php b/src/Symfony/Framework/FoundationBundle/DataCollector/ConfigDataCollector.php
similarity index 98%
rename from src/Symfony/Framework/WebBundle/DataCollector/ConfigDataCollector.php
rename to src/Symfony/Framework/FoundationBundle/DataCollector/ConfigDataCollector.php
index 93c4cd8403..7ca5e98f28 100644
--- a/src/Symfony/Framework/WebBundle/DataCollector/ConfigDataCollector.php
+++ b/src/Symfony/Framework/FoundationBundle/DataCollector/ConfigDataCollector.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\DataCollector;
+namespace Symfony\Framework\FoundationBundle\DataCollector;
 
 use Symfony\Foundation\Kernel;
 use Symfony\Components\HttpKernel\Profiler\DataCollector\DataCollector;
@@ -19,7 +19,7 @@ use Symfony\Components\DependencyInjection\ContainerInterface;
  * ConfigDataCollector.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class ConfigDataCollector extends DataCollector
diff --git a/src/Symfony/Framework/WebBundle/DataCollector/TimerDataCollector.php b/src/Symfony/Framework/FoundationBundle/DataCollector/TimerDataCollector.php
similarity index 94%
rename from src/Symfony/Framework/WebBundle/DataCollector/TimerDataCollector.php
rename to src/Symfony/Framework/FoundationBundle/DataCollector/TimerDataCollector.php
index 3abad4d21d..809307ee80 100644
--- a/src/Symfony/Framework/WebBundle/DataCollector/TimerDataCollector.php
+++ b/src/Symfony/Framework/FoundationBundle/DataCollector/TimerDataCollector.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\DataCollector;
+namespace Symfony\Framework\FoundationBundle\DataCollector;
 
 use Symfony\Components\HttpKernel\Profiler\DataCollector\DataCollector;
 use Symfony\Components\DependencyInjection\ContainerInterface;
@@ -18,7 +18,7 @@ use Symfony\Components\DependencyInjection\ContainerInterface;
  * TimerDataCollector.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class TimerDataCollector extends DataCollector
diff --git a/src/Symfony/Framework/WebBundle/Debug/ExceptionFormatter.php b/src/Symfony/Framework/FoundationBundle/Debug/ExceptionFormatter.php
similarity index 98%
rename from src/Symfony/Framework/WebBundle/Debug/ExceptionFormatter.php
rename to src/Symfony/Framework/FoundationBundle/Debug/ExceptionFormatter.php
index 39eca02ca1..c7a31105e2 100644
--- a/src/Symfony/Framework/WebBundle/Debug/ExceptionFormatter.php
+++ b/src/Symfony/Framework/FoundationBundle/Debug/ExceptionFormatter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Debug;
+namespace Symfony\Framework\FoundationBundle\Debug;
 
 use Symfony\Components\DependencyInjection\ContainerInterface;
 
@@ -17,7 +17,7 @@ use Symfony\Components\DependencyInjection\ContainerInterface;
  * ExceptionFormatter.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class ExceptionFormatter
diff --git a/src/Symfony/Framework/WebBundle/DependencyInjection/WebExtension.php b/src/Symfony/Framework/FoundationBundle/DependencyInjection/WebExtension.php
similarity index 97%
rename from src/Symfony/Framework/WebBundle/DependencyInjection/WebExtension.php
rename to src/Symfony/Framework/FoundationBundle/DependencyInjection/WebExtension.php
index f5b1d0b113..48f7991185 100644
--- a/src/Symfony/Framework/WebBundle/DependencyInjection/WebExtension.php
+++ b/src/Symfony/Framework/FoundationBundle/DependencyInjection/WebExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\DependencyInjection;
+namespace Symfony\Framework\FoundationBundle\DependencyInjection;
 
 use Symfony\Components\DependencyInjection\Loader\LoaderExtension;
 use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
@@ -20,7 +20,7 @@ use Symfony\Components\DependencyInjection\Reference;
  * WebExtension.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class WebExtension extends LoaderExtension
@@ -112,7 +112,7 @@ class WebExtension extends LoaderExtension
         if (isset($config['session']['class'])) {
             $class = $config['session']['class'];
             if (in_array($class, array('Native', 'Pdo'))) {
-                $class = 'Symfony\\Framework\\WebBundle\\Session\\'.$class.'Session';
+                $class = 'Symfony\\Framework\\FoundationBundle\\Session\\'.$class.'Session';
             }
 
             $configuration->setParameter('user.session', 'user.session.'.strtolower($class));
diff --git a/src/Symfony/Framework/WebBundle/WebBundle.php b/src/Symfony/Framework/FoundationBundle/FoundationBundle.php
similarity index 89%
rename from src/Symfony/Framework/WebBundle/WebBundle.php
rename to src/Symfony/Framework/FoundationBundle/FoundationBundle.php
index c5fb131f44..fc7c600543 100644
--- a/src/Symfony/Framework/WebBundle/WebBundle.php
+++ b/src/Symfony/Framework/FoundationBundle/FoundationBundle.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Symfony\Framework\WebBundle;
+namespace Symfony\Framework\FoundationBundle;
 
 use Symfony\Foundation\Bundle\Bundle;
 use Symfony\Components\DependencyInjection\ContainerInterface;
 use Symfony\Components\DependencyInjection\Loader\Loader;
 use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Components\DependencyInjection\BuilderConfiguration;
-use Symfony\Framework\WebBundle\DependencyInjection\WebExtension;
+use Symfony\Framework\FoundationBundle\DependencyInjection\WebExtension;
 
 /*
  * This file is part of the Symfony framework.
@@ -22,10 +22,10 @@ use Symfony\Framework\WebBundle\DependencyInjection\WebExtension;
  * Bundle.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
-class WebBundle extends Bundle
+class FoundationBundle extends Bundle
 {
     /**
      * Customizes the Container instance.
diff --git a/src/Symfony/Framework/WebBundle/Helper/ActionsHelper.php b/src/Symfony/Framework/FoundationBundle/Helper/ActionsHelper.php
similarity index 88%
rename from src/Symfony/Framework/WebBundle/Helper/ActionsHelper.php
rename to src/Symfony/Framework/FoundationBundle/Helper/ActionsHelper.php
index 424e1feb52..4938b6e9c8 100644
--- a/src/Symfony/Framework/WebBundle/Helper/ActionsHelper.php
+++ b/src/Symfony/Framework/FoundationBundle/Helper/ActionsHelper.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Helper;
+namespace Symfony\Framework\FoundationBundle\Helper;
 
 use Symfony\Components\Templating\Helper\Helper;
 use Symfony\Components\OutputEscaper\Escaper;
-use Symfony\Framework\WebBundle\Controller\ControllerManager;
+use Symfony\Framework\FoundationBundle\Controller\ControllerManager;
 
 /*
  * This file is part of the Symfony framework.
@@ -19,7 +19,7 @@ use Symfony\Framework\WebBundle\Controller\ControllerManager;
  * ActionsHelper.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class ActionsHelper extends Helper
@@ -55,7 +55,7 @@ class ActionsHelper extends Helper
      * @param string $controller A controller name to execute (a string like BlogBundle:Post:index), or a relative URI
      * @param array  $options    An array of options
      *
-     * @see Symfony\Framework\WebBundle\Controller\ControllerManager::render()
+     * @see Symfony\Framework\FoundationBundle\Controller\ControllerManager::render()
      */
     public function render($controller, array $options = array())
     {
diff --git a/src/Symfony/Framework/WebBundle/Helper/RequestHelper.php b/src/Symfony/Framework/FoundationBundle/Helper/RequestHelper.php
similarity index 91%
rename from src/Symfony/Framework/WebBundle/Helper/RequestHelper.php
rename to src/Symfony/Framework/FoundationBundle/Helper/RequestHelper.php
index b39d180fc1..143ac9853e 100644
--- a/src/Symfony/Framework/WebBundle/Helper/RequestHelper.php
+++ b/src/Symfony/Framework/FoundationBundle/Helper/RequestHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Helper;
+namespace Symfony\Framework\FoundationBundle\Helper;
 
 use Symfony\Components\Templating\Helper\Helper;
 use Symfony\Components\HttpKernel\Request;
@@ -18,7 +18,7 @@ use Symfony\Components\HttpKernel\Request;
  * RequestHelper.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class RequestHelper extends Helper
diff --git a/src/Symfony/Framework/WebBundle/Helper/RouterHelper.php b/src/Symfony/Framework/FoundationBundle/Helper/RouterHelper.php
similarity index 93%
rename from src/Symfony/Framework/WebBundle/Helper/RouterHelper.php
rename to src/Symfony/Framework/FoundationBundle/Helper/RouterHelper.php
index 2644423099..5175fca182 100644
--- a/src/Symfony/Framework/WebBundle/Helper/RouterHelper.php
+++ b/src/Symfony/Framework/FoundationBundle/Helper/RouterHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Helper;
+namespace Symfony\Framework\FoundationBundle\Helper;
 
 use Symfony\Components\Templating\Helper\Helper;
 use Symfony\Components\Routing\Router;
@@ -18,7 +18,7 @@ use Symfony\Components\Routing\Router;
  * RouterHelper.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class RouterHelper extends Helper
diff --git a/src/Symfony/Framework/WebBundle/Helper/UserHelper.php b/src/Symfony/Framework/FoundationBundle/Helper/UserHelper.php
similarity index 91%
rename from src/Symfony/Framework/WebBundle/Helper/UserHelper.php
rename to src/Symfony/Framework/FoundationBundle/Helper/UserHelper.php
index 4208d5b94b..481d172b86 100644
--- a/src/Symfony/Framework/WebBundle/Helper/UserHelper.php
+++ b/src/Symfony/Framework/FoundationBundle/Helper/UserHelper.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Helper;
+namespace Symfony\Framework\FoundationBundle\Helper;
 
 use Symfony\Components\Templating\Helper\Helper;
-use Symfony\Framework\WebBundle\User;
+use Symfony\Framework\FoundationBundle\User;
 
 /*
  * This file is part of the Symfony framework.
@@ -18,7 +18,7 @@ use Symfony\Framework\WebBundle\User;
  * UserHelper.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class UserHelper extends Helper
diff --git a/src/Symfony/Framework/WebBundle/Listener/ControllerLoader.php b/src/Symfony/Framework/FoundationBundle/Listener/ControllerLoader.php
similarity index 92%
rename from src/Symfony/Framework/WebBundle/Listener/ControllerLoader.php
rename to src/Symfony/Framework/FoundationBundle/Listener/ControllerLoader.php
index 5d83fdf87b..2223df18e8 100644
--- a/src/Symfony/Framework/WebBundle/Listener/ControllerLoader.php
+++ b/src/Symfony/Framework/FoundationBundle/Listener/ControllerLoader.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Listener;
+namespace Symfony\Framework\FoundationBundle\Listener;
 
-use Symfony\Framework\WebBundle\Controller\ControllerManager;
+use Symfony\Framework\FoundationBundle\Controller\ControllerManager;
 use Symfony\Components\HttpKernel\LoggerInterface;
 use Symfony\Components\EventDispatcher\EventDispatcher;
 use Symfony\Components\EventDispatcher\Event;
@@ -21,7 +21,7 @@ use Symfony\Components\EventDispatcher\Event;
  * to execute based on the request parameters.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class ControllerLoader
diff --git a/src/Symfony/Framework/WebBundle/Listener/ExceptionHandler.php b/src/Symfony/Framework/FoundationBundle/Listener/ExceptionHandler.php
similarity index 96%
rename from src/Symfony/Framework/WebBundle/Listener/ExceptionHandler.php
rename to src/Symfony/Framework/FoundationBundle/Listener/ExceptionHandler.php
index c1b95e6837..75417f0e03 100644
--- a/src/Symfony/Framework/WebBundle/Listener/ExceptionHandler.php
+++ b/src/Symfony/Framework/FoundationBundle/Listener/ExceptionHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Listener;
+namespace Symfony\Framework\FoundationBundle\Listener;
 
 use Symfony\Components\DependencyInjection\ContainerInterface;
 use Symfony\Components\EventDispatcher\EventDispatcher;
@@ -21,7 +21,7 @@ use Symfony\Components\HttpKernel\HttpKernelInterface;
  * ExceptionHandler.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class ExceptionHandler
diff --git a/src/Symfony/Framework/WebBundle/Listener/RequestParser.php b/src/Symfony/Framework/FoundationBundle/Listener/RequestParser.php
similarity index 96%
rename from src/Symfony/Framework/WebBundle/Listener/RequestParser.php
rename to src/Symfony/Framework/FoundationBundle/Listener/RequestParser.php
index 32cd491f75..76235ef562 100644
--- a/src/Symfony/Framework/WebBundle/Listener/RequestParser.php
+++ b/src/Symfony/Framework/FoundationBundle/Listener/RequestParser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Listener;
+namespace Symfony\Framework\FoundationBundle\Listener;
 
 use Symfony\Components\HttpKernel\LoggerInterface;
 use Symfony\Components\DependencyInjection\ContainerInterface;
@@ -22,7 +22,7 @@ use Symfony\Components\HttpKernel\HttpKernelInterface;
  * RequestParser.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class RequestParser
diff --git a/src/Symfony/Framework/WebBundle/Profiler.php b/src/Symfony/Framework/FoundationBundle/Profiler.php
similarity index 95%
rename from src/Symfony/Framework/WebBundle/Profiler.php
rename to src/Symfony/Framework/FoundationBundle/Profiler.php
index 3e008ab34e..38ffcb9881 100644
--- a/src/Symfony/Framework/WebBundle/Profiler.php
+++ b/src/Symfony/Framework/FoundationBundle/Profiler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle;
+namespace Symfony\Framework\FoundationBundle;
 
 use Symfony\Components\DependencyInjection\ContainerInterface;
 use Symfony\Components\HttpKernel\Profiler\Profiler as BaseProfiler;
@@ -20,7 +20,7 @@ use Symfony\Components\HttpKernel\LoggerInterface;
  * Profiler.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class Profiler extends BaseProfiler
diff --git a/src/Symfony/Framework/WebBundle/Resources/config/debug.xml b/src/Symfony/Framework/FoundationBundle/Resources/config/debug.xml
similarity index 91%
rename from src/Symfony/Framework/WebBundle/Resources/config/debug.xml
rename to src/Symfony/Framework/FoundationBundle/Resources/config/debug.xml
index 5e40283254..d958d43f43 100644
--- a/src/Symfony/Framework/WebBundle/Resources/config/debug.xml
+++ b/src/Symfony/Framework/FoundationBundle/Resources/config/debug.xml
@@ -5,7 +5,7 @@
     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="templating.debugger.class">Symfony\Framework\WebBundle\Templating\Debugger</parameter>
+        <parameter key="templating.debugger.class">Symfony\Framework\FoundationBundle\Templating\Debugger</parameter>
     </parameters>
 
     <services>
diff --git a/src/Symfony/Framework/WebBundle/Resources/config/default_routing.xml b/src/Symfony/Framework/FoundationBundle/Resources/config/default_routing.xml
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/config/default_routing.xml
rename to src/Symfony/Framework/FoundationBundle/Resources/config/default_routing.xml
diff --git a/src/Symfony/Framework/WebBundle/Resources/config/internal_routing.xml b/src/Symfony/Framework/FoundationBundle/Resources/config/internal_routing.xml
similarity index 83%
rename from src/Symfony/Framework/WebBundle/Resources/config/internal_routing.xml
rename to src/Symfony/Framework/FoundationBundle/Resources/config/internal_routing.xml
index c5446c05e7..d704506bfc 100644
--- a/src/Symfony/Framework/WebBundle/Resources/config/internal_routing.xml
+++ b/src/Symfony/Framework/FoundationBundle/Resources/config/internal_routing.xml
@@ -5,6 +5,6 @@
     xsi:schemaLocation="http://www.symfony-project.org/schema/routing http://www.symfony-project.org/schema/routing/routing-1.0.xsd">
 
   <route id="_internal" pattern="/:controller/:path.:_format">
-    <default key="_controller">WebBundle:Internal:index</default>
+    <default key="_controller">FoundationBundle:Internal:index</default>
   </route>
 </routes>
diff --git a/src/Symfony/Framework/WebBundle/Resources/config/pdo.xml b/src/Symfony/Framework/FoundationBundle/Resources/config/pdo.xml
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/config/pdo.xml
rename to src/Symfony/Framework/FoundationBundle/Resources/config/pdo.xml
diff --git a/src/Symfony/Framework/WebBundle/Resources/config/profiling.xml b/src/Symfony/Framework/FoundationBundle/Resources/config/profiling.xml
similarity index 89%
rename from src/Symfony/Framework/WebBundle/Resources/config/profiling.xml
rename to src/Symfony/Framework/FoundationBundle/Resources/config/profiling.xml
index dfbe7ae951..bbed4add29 100644
--- a/src/Symfony/Framework/WebBundle/Resources/config/profiling.xml
+++ b/src/Symfony/Framework/FoundationBundle/Resources/config/profiling.xml
@@ -5,14 +5,14 @@
     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="profiler.class">Symfony\Framework\WebBundle\Profiler</parameter>
+        <parameter key="profiler.class">Symfony\Framework\FoundationBundle\Profiler</parameter>
         <parameter key="profiler.storage.class">Symfony\Components\HttpKernel\Profiler\ProfilerStorage</parameter>
         <parameter key="profiler.storage.file">%kernel.cache_dir%/profiler.db</parameter>
         <parameter key="profiler.storage.lifetime">86400</parameter>
         <parameter key="profiling.class">Symfony\Components\HttpKernel\Listener\Profiling</parameter>
-        <parameter key="data_collector.config.class">Symfony\Framework\WebBundle\DataCollector\ConfigDataCollector</parameter>
-        <parameter key="data_collector.app.class">Symfony\Framework\WebBundle\DataCollector\AppDataCollector</parameter>
-        <parameter key="data_collector.timer.class">Symfony\Framework\WebBundle\DataCollector\TimerDataCollector</parameter>
+        <parameter key="data_collector.config.class">Symfony\Framework\FoundationBundle\DataCollector\ConfigDataCollector</parameter>
+        <parameter key="data_collector.app.class">Symfony\Framework\FoundationBundle\DataCollector\AppDataCollector</parameter>
+        <parameter key="data_collector.timer.class">Symfony\Framework\FoundationBundle\DataCollector\TimerDataCollector</parameter>
         <parameter key="data_collector.memory.class">Symfony\Components\HttpKernel\Profiler\DataCollector\MemoryDataCollector</parameter>
     </parameters>
 
diff --git a/src/Symfony/Framework/WebBundle/Resources/config/schema/dic/symfony/symfony-1.0.xsd b/src/Symfony/Framework/FoundationBundle/Resources/config/schema/dic/symfony/symfony-1.0.xsd
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/config/schema/dic/symfony/symfony-1.0.xsd
rename to src/Symfony/Framework/FoundationBundle/Resources/config/schema/dic/symfony/symfony-1.0.xsd
diff --git a/src/Symfony/Framework/WebBundle/Resources/config/templating.xml b/src/Symfony/Framework/FoundationBundle/Resources/config/templating.xml
similarity index 94%
rename from src/Symfony/Framework/WebBundle/Resources/config/templating.xml
rename to src/Symfony/Framework/FoundationBundle/Resources/config/templating.xml
index 4a9658ec2e..e8957bc632 100644
--- a/src/Symfony/Framework/WebBundle/Resources/config/templating.xml
+++ b/src/Symfony/Framework/FoundationBundle/Resources/config/templating.xml
@@ -5,7 +5,7 @@
     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="templating.engine.class">Symfony\Framework\WebBundle\Templating\Engine</parameter>
+        <parameter key="templating.engine.class">Symfony\Framework\FoundationBundle\Templating\Engine</parameter>
         <parameter key="templating.loader.filesystem.class">Symfony\Components\Templating\Loader\FilesystemLoader</parameter>
         <parameter key="templating.loader.cache.class">Symfony\Components\Templating\Loader\CacheLoader</parameter>
         <parameter key="templating.loader.chain.class">Symfony\Components\Templating\Loader\ChainLoader</parameter>
@@ -13,10 +13,10 @@
         <parameter key="templating.helper.stylesheets.class">Symfony\Components\Templating\Helper\StylesheetsHelper</parameter>
         <parameter key="templating.helper.slots.class">Symfony\Components\Templating\Helper\SlotsHelper</parameter>
         <parameter key="templating.helper.assets.class">Symfony\Components\Templating\Helper\AssetsHelper</parameter>
-        <parameter key="templating.helper.actions.class">Symfony\Framework\WebBundle\Helper\ActionsHelper</parameter>
-        <parameter key="templating.helper.router.class">Symfony\Framework\WebBundle\Helper\RouterHelper</parameter>
-        <parameter key="templating.helper.request.class">Symfony\Framework\WebBundle\Helper\RequestHelper</parameter>
-        <parameter key="templating.helper.user.class">Symfony\Framework\WebBundle\Helper\UserHelper</parameter>
+        <parameter key="templating.helper.actions.class">Symfony\Framework\FoundationBundle\Helper\ActionsHelper</parameter>
+        <parameter key="templating.helper.router.class">Symfony\Framework\FoundationBundle\Helper\RouterHelper</parameter>
+        <parameter key="templating.helper.request.class">Symfony\Framework\FoundationBundle\Helper\RequestHelper</parameter>
+        <parameter key="templating.helper.user.class">Symfony\Framework\FoundationBundle\Helper\UserHelper</parameter>
         <parameter key="templating.output_escaper">false</parameter>
         <parameter key="templating.assets.version">null</parameter>
     </parameters>
diff --git a/src/Symfony/Framework/WebBundle/Resources/config/toolbar.xml b/src/Symfony/Framework/FoundationBundle/Resources/config/toolbar.xml
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/config/toolbar.xml
rename to src/Symfony/Framework/FoundationBundle/Resources/config/toolbar.xml
diff --git a/src/Symfony/Framework/WebBundle/Resources/config/user.xml b/src/Symfony/Framework/FoundationBundle/Resources/config/user.xml
similarity index 92%
rename from src/Symfony/Framework/WebBundle/Resources/config/user.xml
rename to src/Symfony/Framework/FoundationBundle/Resources/config/user.xml
index 6e4447e73a..9a44e459ec 100644
--- a/src/Symfony/Framework/WebBundle/Resources/config/user.xml
+++ b/src/Symfony/Framework/FoundationBundle/Resources/config/user.xml
@@ -5,10 +5,10 @@
     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="user.class">Symfony\Framework\WebBundle\User</parameter>
+        <parameter key="user.class">Symfony\Framework\FoundationBundle\User</parameter>
         <parameter key="user.default_locale">en</parameter>
-        <parameter key="user.session.class">Symfony\Framework\WebBundle\Session\NativeSession</parameter>
-        <parameter key="user.session.pdo.class">Symfony\Framework\WebBundle\Session\PdoSession</parameter>
+        <parameter key="user.session.class">Symfony\Framework\FoundationBundle\Session\NativeSession</parameter>
+        <parameter key="user.session.pdo.class">Symfony\Framework\FoundationBundle\Session\PdoSession</parameter>
         <parameter key="session.options.name">SYMFONY_SESSION</parameter>
         <parameter key="session.options.auto_start">true</parameter>
         <parameter key="session.options.lifetime">false</parameter>
diff --git a/src/Symfony/Framework/WebBundle/Resources/config/web.xml b/src/Symfony/Framework/FoundationBundle/Resources/config/web.xml
similarity index 90%
rename from src/Symfony/Framework/WebBundle/Resources/config/web.xml
rename to src/Symfony/Framework/FoundationBundle/Resources/config/web.xml
index 59fc72b75b..513f3796f4 100644
--- a/src/Symfony/Framework/WebBundle/Resources/config/web.xml
+++ b/src/Symfony/Framework/FoundationBundle/Resources/config/web.xml
@@ -5,13 +5,13 @@
     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="request_parser.class">Symfony\Framework\WebBundle\Listener\RequestParser</parameter>
-        <parameter key="controller_manager.class">Symfony\Framework\WebBundle\Controller\ControllerManager</parameter>
-        <parameter key="controller_loader.class">Symfony\Framework\WebBundle\Listener\ControllerLoader</parameter>
+        <parameter key="request_parser.class">Symfony\Framework\FoundationBundle\Listener\RequestParser</parameter>
+        <parameter key="controller_manager.class">Symfony\Framework\FoundationBundle\Controller\ControllerManager</parameter>
+        <parameter key="controller_loader.class">Symfony\Framework\FoundationBundle\Listener\ControllerLoader</parameter>
         <parameter key="router.class">Symfony\Components\Routing\Router</parameter>
         <parameter key="response_filter.class">Symfony\Components\HttpKernel\Listener\ResponseFilter</parameter>
-        <parameter key="exception_handler.class">Symfony\Framework\WebBundle\Listener\ExceptionHandler</parameter>
-        <parameter key="exception_handler.controller">WebBundle:Exception:exception</parameter>
+        <parameter key="exception_handler.class">Symfony\Framework\FoundationBundle\Listener\ExceptionHandler</parameter>
+        <parameter key="exception_handler.controller">FoundationBundle:Exception:exception</parameter>
         <parameter key="esi.class">Symfony\Components\HttpKernel\Cache\Esi</parameter>
         <parameter key="esi_filter.class">Symfony\Components\HttpKernel\Listener\EsiFilter</parameter>
     </parameters>
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/Cache.php b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/Cache.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/Cache.php
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/Cache.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/Kernel.php b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/Kernel.php
similarity index 75%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/Kernel.php
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/Kernel.php
index f331641a1a..de757f9b6a 100644
--- a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/Kernel.php
+++ b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/Kernel.php
@@ -6,6 +6,12 @@ use Symfony\Foundation\Kernel;
 use Symfony\Components\DependencyInjection\Loader\XmlFileLoader as ContainerLoader;
 use Symfony\Components\Routing\Loader\XmlFileLoader as RoutingLoader;
 
+use Symfony\Foundation\Bundle\KernelBundle;
+use Symfony\Framework\FoundationBundle\FoundationBundle;
+use Symfony\Framework\ZendBundle\ZendBundle;
+use Symfony\Framework\DoctrineBundle\DoctrineBundle;
+use Symfony\Framework\SwiftmailerBundle\SwiftmailerBundle;
+
 class {{ class }}Kernel extends Kernel
 {
     public function registerRootDir()
@@ -16,13 +22,13 @@ class {{ class }}Kernel extends Kernel
     public function registerBundles()
     {
         $bundles = array(
-            new Symfony\Foundation\Bundle\KernelBundle(),
-            new Symfony\Framework\WebBundle\WebBundle(),
+            new KernelBundle(),
+            new FoundationBundle(),
 
             // enable third-party bundles
-            new Symfony\Framework\ZendBundle\ZendBundle(),
-            new Symfony\Framework\DoctrineBundle\DoctrineBundle(),
-            new Symfony\Framework\SwiftmailerBundle\SwiftmailerBundle(),
+            new ZendBundle(),
+            new DoctrineBundle(),
+            new SwiftmailerBundle(),
 
             // register your bundles here
         );
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/cache/.symfony b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/cache/.symfony
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/cache/.symfony
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/cache/.symfony
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/config/config.xml b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/config/config.xml
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/config/config.xml
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/config/config.xml
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/config/config_dev.xml b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/config/config_dev.xml
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/config/config_dev.xml
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/config/config_dev.xml
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/config/config_prod.xml b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/config/config_prod.xml
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/config/config_prod.xml
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/config/config_prod.xml
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/config/config_test.xml b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/config/config_test.xml
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/config/config_test.xml
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/config/config_test.xml
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/config/routing.xml b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/config/routing.xml
similarity index 82%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/config/routing.xml
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/config/routing.xml
index 73ae1b5ee7..8fe23c584e 100644
--- a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/config/routing.xml
+++ b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/config/routing.xml
@@ -5,6 +5,6 @@
     xsi:schemaLocation="http://www.symfony-project.org/schema/routing http://www.symfony-project.org/schema/routing/routing-1.0.xsd">
 
     <route id="homepage" pattern="/">
-        <default key="_controller">WebBundle:Default:index</default>
+        <default key="_controller">FoundationBundle:Default:index</default>
     </route>
 </routes>
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/console b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/console
similarity index 75%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/console
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/console
index 5bbc71cedc..0be62567c2 100644
--- a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/console
+++ b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/console
@@ -3,7 +3,7 @@
 
 require_once __DIR__.'/{{ class }}Kernel.php';
 
-use Symfony\Framework\WebBundle\Console\Application;
+use Symfony\Framework\FoundationBundle\Console\Application;
 
 $kernel = new {{ class }}Kernel('dev', true);
 
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/logs/.symfony b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/logs/.symfony
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/logs/.symfony
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/logs/.symfony
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/phpunit.xml.dist b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/phpunit.xml.dist
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/phpunit.xml.dist
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/xml/phpunit.xml.dist
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/Cache.php b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/Cache.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/Cache.php
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/Cache.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/Kernel.php b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/Kernel.php
similarity index 75%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/Kernel.php
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/Kernel.php
index 63b54d5bee..20b195d3dc 100644
--- a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/Kernel.php
+++ b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/Kernel.php
@@ -6,6 +6,12 @@ use Symfony\Foundation\Kernel;
 use Symfony\Components\DependencyInjection\Loader\YamlFileLoader as ContainerLoader;
 use Symfony\Components\Routing\Loader\YamlFileLoader as RoutingLoader;
 
+use Symfony\Foundation\Bundle\KernelBundle;
+use Symfony\Framework\FoundationBundle\FoundationBundle;
+use Symfony\Framework\ZendBundle\ZendBundle;
+use Symfony\Framework\DoctrineBundle\DoctrineBundle;
+use Symfony\Framework\SwiftmailerBundle\SwiftmailerBundle;
+
 class {{ class }}Kernel extends Kernel
 {
     public function registerRootDir()
@@ -16,13 +22,13 @@ class {{ class }}Kernel extends Kernel
     public function registerBundles()
     {
         $bundles = array(
-            new Symfony\Foundation\Bundle\KernelBundle(),
-            new Symfony\Framework\WebBundle\WebBundle(),
+            new KernelBundle(),
+            new FoundationBundle(),
 
             // enable third-party bundles
-            new Symfony\Framework\ZendBundle\ZendBundle(),
-            new Symfony\Framework\DoctrineBundle\DoctrineBundle(),
-            new Symfony\Framework\SwiftmailerBundle\SwiftmailerBundle(),
+            new ZendBundle(),
+            new DoctrineBundle(),
+            new SwiftmailerBundle(),
 
             // register your bundles here
         );
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/cache/.symfony b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/cache/.symfony
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/cache/.symfony
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/cache/.symfony
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/config/config.yml b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/config/config.yml
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/config/config.yml
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/config/config.yml
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/config/config_dev.yml b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/config/config_dev.yml
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/config/config_dev.yml
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/config/config_dev.yml
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/config/config_prod.yml b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/config/config_prod.yml
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/config/config_prod.yml
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/config/config_prod.yml
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/config/config_test.yml b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/config/config_test.yml
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/config/config_test.yml
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/config/config_test.yml
diff --git a/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/config/routing.yml b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/config/routing.yml
new file mode 100644
index 0000000000..448e743101
--- /dev/null
+++ b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/config/routing.yml
@@ -0,0 +1,3 @@
+homepage:
+    pattern:  /
+    defaults: { _controller: FoundationBundle:Default:index }
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/console b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/console
similarity index 75%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/console
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/console
index 5bbc71cedc..0be62567c2 100644
--- a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/console
+++ b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/console
@@ -3,7 +3,7 @@
 
 require_once __DIR__.'/{{ class }}Kernel.php';
 
-use Symfony\Framework\WebBundle\Console\Application;
+use Symfony\Framework\FoundationBundle\Console\Application;
 
 $kernel = new {{ class }}Kernel('dev', true);
 
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/logs/.symfony b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/logs/.symfony
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/logs/.symfony
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/logs/.symfony
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/phpunit.xml.dist b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/phpunit.xml.dist
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/phpunit.xml.dist
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/application/yaml/phpunit.xml.dist
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/bundle/Bundle.php b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/bundle/Bundle.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/bundle/Bundle.php
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/bundle/Bundle.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/bundle/Controller/.symfony b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/bundle/Controller/.symfony
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/bundle/Controller/.symfony
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/bundle/Controller/.symfony
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/bundle/Controller/DefaultController.php b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/bundle/Controller/DefaultController.php
similarity index 80%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/bundle/Controller/DefaultController.php
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/bundle/Controller/DefaultController.php
index 9a467703e5..c6119c65af 100644
--- a/src/Symfony/Framework/WebBundle/Resources/skeleton/bundle/Controller/DefaultController.php
+++ b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/bundle/Controller/DefaultController.php
@@ -2,7 +2,7 @@
 
 namespace {{ namespace }}\{{ bundle }}\Controller;
 
-use Symfony\Framework\WebBundle\Controller;
+use Symfony\Framework\FoundationBundle\Controller;
 
 class DefaultController extends Controller
 {
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/bundle/Resources/config/routing.xml b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/bundle/Resources/config/routing.xml
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/bundle/Resources/config/routing.xml
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/bundle/Resources/config/routing.xml
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/bundle/Resources/views/.symfony b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/bundle/Resources/views/.symfony
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/bundle/Resources/views/.symfony
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/bundle/Resources/views/.symfony
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/bundle/Resources/views/Default/index.php b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/bundle/Resources/views/Default/index.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/bundle/Resources/views/Default/index.php
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/bundle/Resources/views/Default/index.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/web/front_controller.php b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/web/front_controller.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/web/front_controller.php
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/web/front_controller.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/web/front_controller_debug.php b/src/Symfony/Framework/FoundationBundle/Resources/skeleton/web/front_controller_debug.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/skeleton/web/front_controller_debug.php
rename to src/Symfony/Framework/FoundationBundle/Resources/skeleton/web/front_controller_debug.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/views/Default/index.php b/src/Symfony/Framework/FoundationBundle/Resources/views/Default/index.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/views/Default/index.php
rename to src/Symfony/Framework/FoundationBundle/Resources/views/Default/index.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/views/Exception/error.atom.php b/src/Symfony/Framework/FoundationBundle/Resources/views/Exception/error.atom.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/views/Exception/error.atom.php
rename to src/Symfony/Framework/FoundationBundle/Resources/views/Exception/error.atom.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/views/Exception/error.css.php b/src/Symfony/Framework/FoundationBundle/Resources/views/Exception/error.css.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/views/Exception/error.css.php
rename to src/Symfony/Framework/FoundationBundle/Resources/views/Exception/error.css.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/views/Exception/error.html.php b/src/Symfony/Framework/FoundationBundle/Resources/views/Exception/error.html.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/views/Exception/error.html.php
rename to src/Symfony/Framework/FoundationBundle/Resources/views/Exception/error.html.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/views/Exception/error.js.php b/src/Symfony/Framework/FoundationBundle/Resources/views/Exception/error.js.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/views/Exception/error.js.php
rename to src/Symfony/Framework/FoundationBundle/Resources/views/Exception/error.js.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/views/Exception/error.json.php b/src/Symfony/Framework/FoundationBundle/Resources/views/Exception/error.json.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/views/Exception/error.json.php
rename to src/Symfony/Framework/FoundationBundle/Resources/views/Exception/error.json.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/views/Exception/error.rdf.php b/src/Symfony/Framework/FoundationBundle/Resources/views/Exception/error.rdf.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/views/Exception/error.rdf.php
rename to src/Symfony/Framework/FoundationBundle/Resources/views/Exception/error.rdf.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/views/Exception/error.txt.php b/src/Symfony/Framework/FoundationBundle/Resources/views/Exception/error.txt.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/views/Exception/error.txt.php
rename to src/Symfony/Framework/FoundationBundle/Resources/views/Exception/error.txt.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/views/Exception/error.xml.php b/src/Symfony/Framework/FoundationBundle/Resources/views/Exception/error.xml.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/views/Exception/error.xml.php
rename to src/Symfony/Framework/FoundationBundle/Resources/views/Exception/error.xml.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/views/Exception/exception.atom.php b/src/Symfony/Framework/FoundationBundle/Resources/views/Exception/exception.atom.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/views/Exception/exception.atom.php
rename to src/Symfony/Framework/FoundationBundle/Resources/views/Exception/exception.atom.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/views/Exception/exception.css.php b/src/Symfony/Framework/FoundationBundle/Resources/views/Exception/exception.css.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/views/Exception/exception.css.php
rename to src/Symfony/Framework/FoundationBundle/Resources/views/Exception/exception.css.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/views/Exception/exception.html.php b/src/Symfony/Framework/FoundationBundle/Resources/views/Exception/exception.html.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/views/Exception/exception.html.php
rename to src/Symfony/Framework/FoundationBundle/Resources/views/Exception/exception.html.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/views/Exception/exception.js.php b/src/Symfony/Framework/FoundationBundle/Resources/views/Exception/exception.js.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/views/Exception/exception.js.php
rename to src/Symfony/Framework/FoundationBundle/Resources/views/Exception/exception.js.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/views/Exception/exception.json.php b/src/Symfony/Framework/FoundationBundle/Resources/views/Exception/exception.json.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/views/Exception/exception.json.php
rename to src/Symfony/Framework/FoundationBundle/Resources/views/Exception/exception.json.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/views/Exception/exception.rdf.php b/src/Symfony/Framework/FoundationBundle/Resources/views/Exception/exception.rdf.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/views/Exception/exception.rdf.php
rename to src/Symfony/Framework/FoundationBundle/Resources/views/Exception/exception.rdf.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/views/Exception/exception.txt.php b/src/Symfony/Framework/FoundationBundle/Resources/views/Exception/exception.txt.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/views/Exception/exception.txt.php
rename to src/Symfony/Framework/FoundationBundle/Resources/views/Exception/exception.txt.php
diff --git a/src/Symfony/Framework/WebBundle/Resources/views/Exception/exception.xml.php b/src/Symfony/Framework/FoundationBundle/Resources/views/Exception/exception.xml.php
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Resources/views/Exception/exception.xml.php
rename to src/Symfony/Framework/FoundationBundle/Resources/views/Exception/exception.xml.php
diff --git a/src/Symfony/Framework/WebBundle/Session/NativeSession.php b/src/Symfony/Framework/FoundationBundle/Session/NativeSession.php
similarity index 98%
rename from src/Symfony/Framework/WebBundle/Session/NativeSession.php
rename to src/Symfony/Framework/FoundationBundle/Session/NativeSession.php
index 42f6245661..769f961a2f 100644
--- a/src/Symfony/Framework/WebBundle/Session/NativeSession.php
+++ b/src/Symfony/Framework/FoundationBundle/Session/NativeSession.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Session;
+namespace Symfony\Framework\FoundationBundle\Session;
 
 /*
  * This file is part of the Symfony framework.
@@ -15,7 +15,7 @@ namespace Symfony\Framework\WebBundle\Session;
  * NativeSession.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class NativeSession implements SessionInterface
diff --git a/src/Symfony/Framework/WebBundle/Session/PdoSession.php b/src/Symfony/Framework/FoundationBundle/Session/PdoSession.php
similarity index 98%
rename from src/Symfony/Framework/WebBundle/Session/PdoSession.php
rename to src/Symfony/Framework/FoundationBundle/Session/PdoSession.php
index 54be3fe932..810606d624 100644
--- a/src/Symfony/Framework/WebBundle/Session/PdoSession.php
+++ b/src/Symfony/Framework/FoundationBundle/Session/PdoSession.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Session;
+namespace Symfony\Framework\FoundationBundle\Session;
 
 /*
  * This file is part of the Symfony framework.
@@ -15,7 +15,7 @@ namespace Symfony\Framework\WebBundle\Session;
  * PdoSession.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class PdoSession extends NativeSession
diff --git a/src/Symfony/Framework/WebBundle/Session/SessionInterface.php b/src/Symfony/Framework/FoundationBundle/Session/SessionInterface.php
similarity index 95%
rename from src/Symfony/Framework/WebBundle/Session/SessionInterface.php
rename to src/Symfony/Framework/FoundationBundle/Session/SessionInterface.php
index 4f85233482..0d1f7f70c3 100644
--- a/src/Symfony/Framework/WebBundle/Session/SessionInterface.php
+++ b/src/Symfony/Framework/FoundationBundle/Session/SessionInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Session;
+namespace Symfony\Framework\FoundationBundle\Session;
 
 /*
  * This file is part of the Symfony framework.
@@ -15,7 +15,7 @@ namespace Symfony\Framework\WebBundle\Session;
  * SessionInterface.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 interface SessionInterface
diff --git a/src/Symfony/Framework/WebBundle/Templating/Debugger.php b/src/Symfony/Framework/FoundationBundle/Templating/Debugger.php
similarity index 91%
rename from src/Symfony/Framework/WebBundle/Templating/Debugger.php
rename to src/Symfony/Framework/FoundationBundle/Templating/Debugger.php
index dc3277bc5e..a7a89cac81 100644
--- a/src/Symfony/Framework/WebBundle/Templating/Debugger.php
+++ b/src/Symfony/Framework/FoundationBundle/Templating/Debugger.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Templating;
+namespace Symfony\Framework\FoundationBundle\Templating;
 
 use Symfony\Components\Templating\DebuggerInterface;
 use Symfony\Components\HttpKernel\LoggerInterface;
@@ -18,7 +18,7 @@ use Symfony\Components\HttpKernel\LoggerInterface;
  * Binds the Symfony templating loader debugger to the Symfony logger.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class Debugger implements DebuggerInterface
diff --git a/src/Symfony/Framework/WebBundle/Templating/Engine.php b/src/Symfony/Framework/FoundationBundle/Templating/Engine.php
similarity index 97%
rename from src/Symfony/Framework/WebBundle/Templating/Engine.php
rename to src/Symfony/Framework/FoundationBundle/Templating/Engine.php
index cca27909d6..9bb4cf8e43 100755
--- a/src/Symfony/Framework/WebBundle/Templating/Engine.php
+++ b/src/Symfony/Framework/FoundationBundle/Templating/Engine.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Templating;
+namespace Symfony\Framework\FoundationBundle\Templating;
 
 use Symfony\Components\Templating\Engine as BaseEngine;
 use Symfony\Components\Templating\Loader\LoaderInterface;
@@ -21,7 +21,7 @@ use Symfony\Components\DependencyInjection\ContainerInterface;
  * escapes template parameters.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class Engine extends BaseEngine
diff --git a/src/Symfony/Framework/WebBundle/Test/WebTestCase.php b/src/Symfony/Framework/FoundationBundle/Test/WebTestCase.php
similarity index 96%
rename from src/Symfony/Framework/WebBundle/Test/WebTestCase.php
rename to src/Symfony/Framework/FoundationBundle/Test/WebTestCase.php
index c6df8a0ced..ee9be6c52b 100644
--- a/src/Symfony/Framework/WebBundle/Test/WebTestCase.php
+++ b/src/Symfony/Framework/FoundationBundle/Test/WebTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Test;
+namespace Symfony\Framework\FoundationBundle\Test;
 
 use Symfony\Foundation\Test\WebTestCase as BaseWebTestCase;
 use Symfony\Components\Finder\Finder;
@@ -19,7 +19,7 @@ use Symfony\Components\HttpKernel\Response;
  * WebTestCase is the base class for functional tests.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 abstract class WebTestCase extends BaseWebTestCase
diff --git a/src/Symfony/Framework/WebBundle/Tests/DependencyInjection/WebExtensionTest.php b/src/Symfony/Framework/FoundationBundle/Tests/DependencyInjection/WebExtensionTest.php
similarity index 61%
rename from src/Symfony/Framework/WebBundle/Tests/DependencyInjection/WebExtensionTest.php
rename to src/Symfony/Framework/FoundationBundle/Tests/DependencyInjection/WebExtensionTest.php
index 8691c6538d..b144e7be80 100644
--- a/src/Symfony/Framework/WebBundle/Tests/DependencyInjection/WebExtensionTest.php
+++ b/src/Symfony/Framework/FoundationBundle/Tests/DependencyInjection/WebExtensionTest.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Framework\WebBundle\Tests\DependencyInjection;
+namespace Symfony\Framework\FoundationBundle\Tests\DependencyInjection;
 
-use Symfony\Framework\WebBundle\Tests\TestCase;
-use Symfony\Framework\WebBundle\DependencyInjection\WebExtension;
+use Symfony\Framework\FoundationBundle\Tests\TestCase;
+use Symfony\Framework\FoundationBundle\DependencyInjection\WebExtension;
 use Symfony\Components\DependencyInjection\BuilderConfiguration;
 
 class WebExtensionTest extends TestCase
@@ -23,13 +23,13 @@ class WebExtensionTest extends TestCase
         $loader = new WebExtension();
 
         $configuration = $loader->configLoad(array(), $configuration);
-        $this->assertEquals('Symfony\\Framework\\WebBundle\\Listener\\RequestParser', $configuration->getParameter('request_parser.class'), '->webLoad() loads the web.xml file if not already loaded');
+        $this->assertEquals('Symfony\\Framework\\FoundationBundle\\Listener\\RequestParser', $configuration->getParameter('request_parser.class'), '->webLoad() loads the web.xml file if not already loaded');
 
         $configuration = new BuilderConfiguration();
         $loader = new WebExtension();
 
         $configuration = $loader->configLoad(array('profiler' => true), $configuration);
-        $this->assertEquals('Symfony\\Framework\\WebBundle\\Profiler', $configuration->getParameter('profiler.class'), '->configLoad() loads the collectors.xml file if not already loaded');
+        $this->assertEquals('Symfony\\Framework\\FoundationBundle\\Profiler', $configuration->getParameter('profiler.class'), '->configLoad() loads the collectors.xml file if not already loaded');
         $this->assertFalse($configuration->hasParameter('debug.toolbar.class'), '->configLoad() does not load the toolbar.xml file');
 
         $configuration = $loader->configLoad(array('toolbar' => true), $configuration);
@@ -42,7 +42,7 @@ class WebExtensionTest extends TestCase
         $loader = new WebExtension();
 
         $configuration = $loader->userLoad(array(), $configuration);
-        $this->assertEquals('Symfony\\Framework\\WebBundle\\User', $configuration->getParameter('user.class'), '->userLoad() loads the user.xml file if not already loaded');
+        $this->assertEquals('Symfony\\Framework\\FoundationBundle\\User', $configuration->getParameter('user.class'), '->userLoad() loads the user.xml file if not already loaded');
     }
 
     public function testTemplatingLoad()
@@ -51,6 +51,6 @@ class WebExtensionTest extends TestCase
         $loader = new WebExtension();
 
         $configuration = $loader->templatingLoad(array(), $configuration);
-        $this->assertEquals('Symfony\\Framework\\WebBundle\\Templating\\Engine', $configuration->getParameter('templating.engine.class'), '->templatingLoad() loads the templating.xml file if not already loaded');
+        $this->assertEquals('Symfony\\Framework\\FoundationBundle\\Templating\\Engine', $configuration->getParameter('templating.engine.class'), '->templatingLoad() loads the templating.xml file if not already loaded');
     }
 }
diff --git a/src/Symfony/Framework/WebBundle/Tests/TestCase.php b/src/Symfony/Framework/FoundationBundle/Tests/TestCase.php
similarity index 85%
rename from src/Symfony/Framework/WebBundle/Tests/TestCase.php
rename to src/Symfony/Framework/FoundationBundle/Tests/TestCase.php
index 367e6d53e1..435b6f86cf 100644
--- a/src/Symfony/Framework/WebBundle/Tests/TestCase.php
+++ b/src/Symfony/Framework/FoundationBundle/Tests/TestCase.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Framework\WebBundle\Tests;
+namespace Symfony\Framework\FoundationBundle\Tests;
 
 class TestCase extends \PHPUnit_Framework_TestCase
 {
diff --git a/src/Symfony/Framework/WebBundle/Tests/Util/MustacheTest.php b/src/Symfony/Framework/FoundationBundle/Tests/Util/MustacheTest.php
similarity index 87%
rename from src/Symfony/Framework/WebBundle/Tests/Util/MustacheTest.php
rename to src/Symfony/Framework/FoundationBundle/Tests/Util/MustacheTest.php
index 6aafff8b19..6d26a71c81 100644
--- a/src/Symfony/Framework/WebBundle/Tests/Util/MustacheTest.php
+++ b/src/Symfony/Framework/FoundationBundle/Tests/Util/MustacheTest.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Framework\WebBundle\Tests\Util;
+namespace Symfony\Framework\FoundationBundle\Tests\Util;
 
-use Symfony\Framework\WebBundle\Tests\TestCase;
-use Symfony\Framework\WebBundle\Util\Mustache;
-use Symfony\Framework\WebBundle\Util\Filesystem;
+use Symfony\Framework\FoundationBundle\Tests\TestCase;
+use Symfony\Framework\FoundationBundle\Util\Mustache;
+use Symfony\Framework\FoundationBundle\Util\Filesystem;
 
 class MustacheTest extends TestCase
 {
diff --git a/src/Symfony/Framework/WebBundle/Tests/Util/fixtures/foo/bar.txt b/src/Symfony/Framework/FoundationBundle/Tests/Util/fixtures/foo/bar.txt
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Tests/Util/fixtures/foo/bar.txt
rename to src/Symfony/Framework/FoundationBundle/Tests/Util/fixtures/foo/bar.txt
diff --git a/src/Symfony/Framework/WebBundle/Tests/Util/fixtures/foo/bar/foo.txt b/src/Symfony/Framework/FoundationBundle/Tests/Util/fixtures/foo/bar/foo.txt
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Tests/Util/fixtures/foo/bar/foo.txt
rename to src/Symfony/Framework/FoundationBundle/Tests/Util/fixtures/foo/bar/foo.txt
diff --git a/src/Symfony/Framework/WebBundle/Tests/Util/fixtures/template.txt b/src/Symfony/Framework/FoundationBundle/Tests/Util/fixtures/template.txt
similarity index 100%
rename from src/Symfony/Framework/WebBundle/Tests/Util/fixtures/template.txt
rename to src/Symfony/Framework/FoundationBundle/Tests/Util/fixtures/template.txt
diff --git a/src/Symfony/Framework/WebBundle/User.php b/src/Symfony/Framework/FoundationBundle/User.php
similarity index 95%
rename from src/Symfony/Framework/WebBundle/User.php
rename to src/Symfony/Framework/FoundationBundle/User.php
index c86048694b..91fd8191b6 100644
--- a/src/Symfony/Framework/WebBundle/User.php
+++ b/src/Symfony/Framework/FoundationBundle/User.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Symfony\Framework\WebBundle;
+namespace Symfony\Framework\FoundationBundle;
 
 use Symfony\Components\EventDispatcher\EventDispatcher;
 use Symfony\Components\EventDispatcher\Event;
-use Symfony\Framework\WebBundle\Session\SessionInterface;
+use Symfony\Framework\FoundationBundle\Session\SessionInterface;
 
 /*
  * This file is part of the Symfony framework.
@@ -19,7 +19,7 @@ use Symfony\Framework\WebBundle\Session\SessionInterface;
  * User.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class User
diff --git a/src/Symfony/Framework/WebBundle/Util/Filesystem.php b/src/Symfony/Framework/FoundationBundle/Util/Filesystem.php
similarity index 98%
rename from src/Symfony/Framework/WebBundle/Util/Filesystem.php
rename to src/Symfony/Framework/FoundationBundle/Util/Filesystem.php
index 50821d2b92..4733097ef8 100644
--- a/src/Symfony/Framework/WebBundle/Util/Filesystem.php
+++ b/src/Symfony/Framework/FoundationBundle/Util/Filesystem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Util;
+namespace Symfony\Framework\FoundationBundle\Util;
 
 use Symfony\Components\Finder\Finder;
 
@@ -17,7 +17,7 @@ use Symfony\Components\Finder\Finder;
  * Provides basic utility to manipulate the file system.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class Filesystem
diff --git a/src/Symfony/Framework/WebBundle/Util/Mustache.php b/src/Symfony/Framework/FoundationBundle/Util/Mustache.php
similarity index 92%
rename from src/Symfony/Framework/WebBundle/Util/Mustache.php
rename to src/Symfony/Framework/FoundationBundle/Util/Mustache.php
index 59b69bdd82..28b4b1ce83 100644
--- a/src/Symfony/Framework/WebBundle/Util/Mustache.php
+++ b/src/Symfony/Framework/FoundationBundle/Util/Mustache.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\WebBundle\Util;
+namespace Symfony\Framework\FoundationBundle\Util;
 
 /*
  * This file is part of the Symfony framework.
@@ -15,7 +15,7 @@ namespace Symfony\Framework\WebBundle\Util;
  * Mustache.
  *
  * @package    Symfony
- * @subpackage Framework_WebBundle
+ * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class Mustache
diff --git a/src/Symfony/Framework/PropelBundle/Command/BuildSqlCommand.php b/src/Symfony/Framework/PropelBundle/Command/BuildSqlCommand.php
index ded954e09a..4954692b34 100644
--- a/src/Symfony/Framework/PropelBundle/Command/BuildSqlCommand.php
+++ b/src/Symfony/Framework/PropelBundle/Command/BuildSqlCommand.php
@@ -8,7 +8,7 @@ use Symfony\Components\Console\Input\InputOption;
 use Symfony\Components\Console\Input\InputInterface;
 use Symfony\Components\Console\Output\OutputInterface;
 use Symfony\Components\Console\Output\Output;
-use Symfony\Framework\WebBundle\Util\Filesystem;
+use Symfony\Framework\FoundationBundle\Util\Filesystem;
 
 /*
  * This file is part of the Symfony framework.
diff --git a/src/Symfony/Framework/PropelBundle/Command/PhingCommand.php b/src/Symfony/Framework/PropelBundle/Command/PhingCommand.php
index cd5085a178..82feabcf2a 100644
--- a/src/Symfony/Framework/PropelBundle/Command/PhingCommand.php
+++ b/src/Symfony/Framework/PropelBundle/Command/PhingCommand.php
@@ -8,7 +8,7 @@ use Symfony\Components\Console\Input\InputOption;
 use Symfony\Components\Console\Input\InputInterface;
 use Symfony\Components\Console\Output\OutputInterface;
 use Symfony\Components\Console\Output\Output;
-use Symfony\Framework\WebBundle\Util\Filesystem;
+use Symfony\Framework\FoundationBundle\Util\Filesystem;
 use Symfony\Components\Finder\Finder;
 
 /*
diff --git a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/config/routing.yml b/src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/config/routing.yml
deleted file mode 100644
index 69e4706254..0000000000
--- a/src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/config/routing.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-homepage:
-    pattern:  /
-    defaults: { _controller: WebBundle:Default:index }