Re-organizing packages