Moved bundling into its own package