Packages and sub packages refactoring