remaining package refactoring