Restructured the packages for final submisssion