Refactoring of the package structre