Refactoring pakietow.