refactoring packages
cleanup