Refactoring Core / MH3U Bundles

Refactor the bundles.