Remove assumptions about folder names of bundles