Re-arrange and change some packages