Refactoring of all the package naming