Move definition of Bundle to a separate module.