Refactor the bundle autoloading (part 2)