Updated file structure to match symfony bundles