some classes were moved to db package