Restructure the packages