Restructure to package system