Package Restructure #GOLD-5
Remove Test Items #GOLD-4