Removed the original database.php. It's in the includes folder now.