Restructured some of the package