This commit removes the old database package, moves the new package into its place, and updates all imports accordingly.
Dave Collins