Moved tables into an own package