Restructured some packages