Renamed database package to db