Restructure packages.