Restructure for global package