reorganized pkg