reorganizing package