Restructs packages