Updating the hybrid coil geometries

Updating the hybrid coil geometries to be consistent with CAD. Fixing the COIL_BOX to be COIL_BOX_1 so that it is not defined twice accidentally in different files as different objects. Minimized spacing between coil joints as much as possible.