Update package path
Refactor