Added db and renamed folders