Re-organizing package file keys.