Refactoring package naming for