Restructured the JCMT-OT SW package