Package structure refactor.