Refactoring core/jukebox bundle