Restructured all the packages