made some packaging refactoring