renaming and reorganizing database modules (work in progress)