Renamed some files and changed unit tests to correspond with updated db.