restructure package for distribution