Rearranged Packaged and removed Enum classes to save memory