moving stuff around, PSR-1 edit on DB.php, renaming so PSR-1 can work