Fix org package mess up