refactoring - rename some packages