Refactoring dos pacotes