Moving Database package closer to root