change packgage structure