changed the default structure to match the one from the upcoming Symfony SE