Rearranged the Packages
Integrated with new design