Started to reorganise and merge the two hyperelliptic curve sections