Move bundles into their own file and do some cleanup.