Restructured the packages again