Internal Package Restructure