Removing DB specific packages, reorganizing