Renaming packages and adding initial pass at organizing tables to migrate into buckets