refactoring, reorganization of packages