refactored directory structure in WebsiteCharityBundle