some package layout refactoring