added symfony bundle and some refactoring