Changed directory structure and class names to work with Symfony 2 autoloader