Re-organized packaging