Refactor packages for DC21-305