refactoring of the package new files