Half done changes to support bundles instead of file system.