Restructured some packages.