re-organized package