Refactoring packages structure