Symfony structure re-jig