Refactor pakages name