Refactoring package naming convention