Changed to bundles instead of individual files