Removed bundles.php and changed bundle.php to handle both situations.