Changed structure and added namespaces for use in Symfony 2.x