diff --git a/src/spicelib/devices/hisimhv/Makefile.am b/src/spicelib/devices/hisimhv1/Makefile.am
similarity index 100%
rename from src/spicelib/devices/hisimhv/Makefile.am
rename to src/spicelib/devices/hisimhv1/Makefile.am
diff --git a/src/spicelib/devices/hisimhv/hisimhv.h b/src/spicelib/devices/hisimhv1/hisimhv.h
similarity index 100%
rename from src/spicelib/devices/hisimhv/hisimhv.h
rename to src/spicelib/devices/hisimhv1/hisimhv.h
diff --git a/src/spicelib/devices/hisimhv/hsmhv.c b/src/spicelib/devices/hisimhv1/hsmhv.c
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhv.c
rename to src/spicelib/devices/hisimhv1/hsmhv.c
diff --git a/src/spicelib/devices/hisimhv/hsmhvacld.c b/src/spicelib/devices/hisimhv1/hsmhvacld.c
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvacld.c
rename to src/spicelib/devices/hisimhv1/hsmhvacld.c
diff --git a/src/spicelib/devices/hisimhv/hsmhvask.c b/src/spicelib/devices/hisimhv1/hsmhvask.c
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvask.c
rename to src/spicelib/devices/hisimhv1/hsmhvask.c
diff --git a/src/spicelib/devices/hisimhv/hsmhvcvtest.c b/src/spicelib/devices/hisimhv1/hsmhvcvtest.c
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvcvtest.c
rename to src/spicelib/devices/hisimhv1/hsmhvcvtest.c
diff --git a/src/spicelib/devices/hisimhv/hsmhvdef.h b/src/spicelib/devices/hisimhv1/hsmhvdef.h
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvdef.h
rename to src/spicelib/devices/hisimhv1/hsmhvdef.h
diff --git a/src/spicelib/devices/hisimhv/hsmhvdel.c b/src/spicelib/devices/hisimhv1/hsmhvdel.c
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvdel.c
rename to src/spicelib/devices/hisimhv1/hsmhvdel.c
diff --git a/src/spicelib/devices/hisimhv/hsmhvdest.c b/src/spicelib/devices/hisimhv1/hsmhvdest.c
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvdest.c
rename to src/spicelib/devices/hisimhv1/hsmhvdest.c
diff --git a/src/spicelib/devices/hisimhv/hsmhveval.c b/src/spicelib/devices/hisimhv1/hsmhveval.c
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhveval.c
rename to src/spicelib/devices/hisimhv1/hsmhveval.c
diff --git a/src/spicelib/devices/hisimhv/hsmhveval_qover.h b/src/spicelib/devices/hisimhv1/hsmhveval_qover.h
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhveval_qover.h
rename to src/spicelib/devices/hisimhv1/hsmhveval_qover.h
diff --git a/src/spicelib/devices/hisimhv/hsmhvevalenv.h b/src/spicelib/devices/hisimhv1/hsmhvevalenv.h
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvevalenv.h
rename to src/spicelib/devices/hisimhv1/hsmhvevalenv.h
diff --git a/src/spicelib/devices/hisimhv/hsmhvext.h b/src/spicelib/devices/hisimhv1/hsmhvext.h
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvext.h
rename to src/spicelib/devices/hisimhv1/hsmhvext.h
diff --git a/src/spicelib/devices/hisimhv/hsmhvgetic.c b/src/spicelib/devices/hisimhv1/hsmhvgetic.c
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvgetic.c
rename to src/spicelib/devices/hisimhv1/hsmhvgetic.c
diff --git a/src/spicelib/devices/hisimhv/hsmhvinit.c b/src/spicelib/devices/hisimhv1/hsmhvinit.c
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvinit.c
rename to src/spicelib/devices/hisimhv1/hsmhvinit.c
diff --git a/src/spicelib/devices/hisimhv/hsmhvinit.h b/src/spicelib/devices/hisimhv1/hsmhvinit.h
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvinit.h
rename to src/spicelib/devices/hisimhv1/hsmhvinit.h
diff --git a/src/spicelib/devices/hisimhv/hsmhvitf.h b/src/spicelib/devices/hisimhv1/hsmhvitf.h
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvitf.h
rename to src/spicelib/devices/hisimhv1/hsmhvitf.h
diff --git a/src/spicelib/devices/hisimhv/hsmhvld.c b/src/spicelib/devices/hisimhv1/hsmhvld.c
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvld.c
rename to src/spicelib/devices/hisimhv1/hsmhvld.c
diff --git a/src/spicelib/devices/hisimhv/hsmhvld_info_eval.h b/src/spicelib/devices/hisimhv1/hsmhvld_info_eval.h
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvld_info_eval.h
rename to src/spicelib/devices/hisimhv1/hsmhvld_info_eval.h
diff --git a/src/spicelib/devices/hisimhv/hsmhvmask.c b/src/spicelib/devices/hisimhv1/hsmhvmask.c
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvmask.c
rename to src/spicelib/devices/hisimhv1/hsmhvmask.c
diff --git a/src/spicelib/devices/hisimhv/hsmhvmdel.c b/src/spicelib/devices/hisimhv1/hsmhvmdel.c
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvmdel.c
rename to src/spicelib/devices/hisimhv1/hsmhvmdel.c
diff --git a/src/spicelib/devices/hisimhv/hsmhvmpar.c b/src/spicelib/devices/hisimhv1/hsmhvmpar.c
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvmpar.c
rename to src/spicelib/devices/hisimhv1/hsmhvmpar.c
diff --git a/src/spicelib/devices/hisimhv/hsmhvnoi.c b/src/spicelib/devices/hisimhv1/hsmhvnoi.c
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvnoi.c
rename to src/spicelib/devices/hisimhv1/hsmhvnoi.c
diff --git a/src/spicelib/devices/hisimhv/hsmhvpar.c b/src/spicelib/devices/hisimhv1/hsmhvpar.c
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvpar.c
rename to src/spicelib/devices/hisimhv1/hsmhvpar.c
diff --git a/src/spicelib/devices/hisimhv/hsmhvpzld.c b/src/spicelib/devices/hisimhv1/hsmhvpzld.c
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvpzld.c
rename to src/spicelib/devices/hisimhv1/hsmhvpzld.c
diff --git a/src/spicelib/devices/hisimhv/hsmhvset.c b/src/spicelib/devices/hisimhv1/hsmhvset.c
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvset.c
rename to src/spicelib/devices/hisimhv1/hsmhvset.c
diff --git a/src/spicelib/devices/hisimhv/hsmhvtemp.c b/src/spicelib/devices/hisimhv1/hsmhvtemp.c
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvtemp.c
rename to src/spicelib/devices/hisimhv1/hsmhvtemp.c
diff --git a/src/spicelib/devices/hisimhv/hsmhvtemp_eval.h b/src/spicelib/devices/hisimhv1/hsmhvtemp_eval.h
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvtemp_eval.h
rename to src/spicelib/devices/hisimhv1/hsmhvtemp_eval.h
diff --git a/src/spicelib/devices/hisimhv/hsmhvtrunc.c b/src/spicelib/devices/hisimhv1/hsmhvtrunc.c
similarity index 100%
rename from src/spicelib/devices/hisimhv/hsmhvtrunc.c
rename to src/spicelib/devices/hisimhv1/hsmhvtrunc.c
diff --git a/tests/hisimhv/Makefile.am b/tests/hisimhv1/Makefile.am
similarity index 100%
rename from tests/hisimhv/Makefile.am
rename to tests/hisimhv1/Makefile.am
diff --git a/tests/hisimhv/nmos/parameters/nmosParameters b/tests/hisimhv1/nmos/parameters/nmosParameters
similarity index 100%
rename from tests/hisimhv/nmos/parameters/nmosParameters
rename to tests/hisimhv1/nmos/parameters/nmosParameters
diff --git a/tests/hisimhv/nmos/qaSpec b/tests/hisimhv1/nmos/qaSpec
similarity index 100%
rename from tests/hisimhv/nmos/qaSpec
rename to tests/hisimhv1/nmos/qaSpec
diff --git a/tests/hisimhv/nmos/qaSpec.basic b/tests/hisimhv1/nmos/qaSpec.basic
similarity index 100%
rename from tests/hisimhv/nmos/qaSpec.basic
rename to tests/hisimhv1/nmos/qaSpec.basic
diff --git a/tests/hisimhv/nmos/reference/acFreq.standard b/tests/hisimhv1/nmos/reference/acFreq.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/acFreq.standard
rename to tests/hisimhv1/nmos/reference/acFreq.standard
diff --git a/tests/hisimhv/nmos/reference/acFreq_coadov.standard b/tests/hisimhv1/nmos/reference/acFreq_coadov.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/acFreq_coadov.standard
rename to tests/hisimhv1/nmos/reference/acFreq_coadov.standard
diff --git a/tests/hisimhv/nmos/reference/acFreq_coiigs.standard b/tests/hisimhv1/nmos/reference/acFreq_coiigs.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/acFreq_coiigs.standard
rename to tests/hisimhv1/nmos/reference/acFreq_coiigs.standard
diff --git a/tests/hisimhv/nmos/reference/acFreq_conqs.standard b/tests/hisimhv1/nmos/reference/acFreq_conqs.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/acFreq_conqs.standard
rename to tests/hisimhv1/nmos/reference/acFreq_conqs.standard
diff --git a/tests/hisimhv/nmos/reference/acFreq_coovlp.standard b/tests/hisimhv1/nmos/reference/acFreq_coovlp.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/acFreq_coovlp.standard
rename to tests/hisimhv1/nmos/reference/acFreq_coovlp.standard
diff --git a/tests/hisimhv/nmos/reference/acFreq_cosym.standard b/tests/hisimhv1/nmos/reference/acFreq_cosym.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/acFreq_cosym.standard
rename to tests/hisimhv1/nmos/reference/acFreq_cosym.standard
diff --git a/tests/hisimhv/nmos/reference/acFreq_nover.standard b/tests/hisimhv1/nmos/reference/acFreq_nover.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/acFreq_nover.standard
rename to tests/hisimhv1/nmos/reference/acFreq_nover.standard
diff --git a/tests/hisimhv/nmos/reference/acVd.standard b/tests/hisimhv1/nmos/reference/acVd.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/acVd.standard
rename to tests/hisimhv1/nmos/reference/acVd.standard
diff --git a/tests/hisimhv/nmos/reference/acVd_corsrd1.standard b/tests/hisimhv1/nmos/reference/acVd_corsrd1.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/acVd_corsrd1.standard
rename to tests/hisimhv1/nmos/reference/acVd_corsrd1.standard
diff --git a/tests/hisimhv/nmos/reference/acVd_corsrd2.standard b/tests/hisimhv1/nmos/reference/acVd_corsrd2.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/acVd_corsrd2.standard
rename to tests/hisimhv1/nmos/reference/acVd_corsrd2.standard
diff --git a/tests/hisimhv/nmos/reference/acVd_cosym.standard b/tests/hisimhv1/nmos/reference/acVd_cosym.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/acVd_cosym.standard
rename to tests/hisimhv1/nmos/reference/acVd_cosym.standard
diff --git a/tests/hisimhv/nmos/reference/acVd_cvdsover.standard b/tests/hisimhv1/nmos/reference/acVd_cvdsover.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/acVd_cvdsover.standard
rename to tests/hisimhv1/nmos/reference/acVd_cvdsover.standard
diff --git a/tests/hisimhv/nmos/reference/dcSw_Id1_vb0.standard b/tests/hisimhv1/nmos/reference/dcSw_Id1_vb0.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/dcSw_Id1_vb0.standard
rename to tests/hisimhv1/nmos/reference/dcSw_Id1_vb0.standard
diff --git a/tests/hisimhv/nmos/reference/dcSw_Id1_vb0_jd.standard b/tests/hisimhv1/nmos/reference/dcSw_Id1_vb0_jd.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/dcSw_Id1_vb0_jd.standard
rename to tests/hisimhv1/nmos/reference/dcSw_Id1_vb0_jd.standard
diff --git a/tests/hisimhv/nmos/reference/dcSw_Id1_vb1.standard b/tests/hisimhv1/nmos/reference/dcSw_Id1_vb1.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/dcSw_Id1_vb1.standard
rename to tests/hisimhv1/nmos/reference/dcSw_Id1_vb1.standard
diff --git a/tests/hisimhv/nmos/reference/dcSw_Id1_vb2.standard b/tests/hisimhv1/nmos/reference/dcSw_Id1_vb2.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/dcSw_Id1_vb2.standard
rename to tests/hisimhv1/nmos/reference/dcSw_Id1_vb2.standard
diff --git a/tests/hisimhv/nmos/reference/dcSw_Ig1_vb0.standard b/tests/hisimhv1/nmos/reference/dcSw_Ig1_vb0.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/dcSw_Ig1_vb0.standard
rename to tests/hisimhv1/nmos/reference/dcSw_Ig1_vb0.standard
diff --git a/tests/hisimhv/nmos/reference/dcSw_Ig1_vb0_jd.standard b/tests/hisimhv1/nmos/reference/dcSw_Ig1_vb0_jd.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/dcSw_Ig1_vb0_jd.standard
rename to tests/hisimhv1/nmos/reference/dcSw_Ig1_vb0_jd.standard
diff --git a/tests/hisimhv/nmos/reference/dcSw_Ig1_vb1.standard b/tests/hisimhv1/nmos/reference/dcSw_Ig1_vb1.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/dcSw_Ig1_vb1.standard
rename to tests/hisimhv1/nmos/reference/dcSw_Ig1_vb1.standard
diff --git a/tests/hisimhv/nmos/reference/dcSw_Ig1_vb2.standard b/tests/hisimhv1/nmos/reference/dcSw_Ig1_vb2.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/dcSw_Ig1_vb2.standard
rename to tests/hisimhv1/nmos/reference/dcSw_Ig1_vb2.standard
diff --git a/tests/hisimhv/nmos/reference/dcSw_corsrd0.standard b/tests/hisimhv1/nmos/reference/dcSw_corsrd0.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/dcSw_corsrd0.standard
rename to tests/hisimhv1/nmos/reference/dcSw_corsrd0.standard
diff --git a/tests/hisimhv/nmos/reference/dcSw_corsrd1.standard b/tests/hisimhv1/nmos/reference/dcSw_corsrd1.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/dcSw_corsrd1.standard
rename to tests/hisimhv1/nmos/reference/dcSw_corsrd1.standard
diff --git a/tests/hisimhv/nmos/reference/dcSw_corsrd2.standard b/tests/hisimhv1/nmos/reference/dcSw_corsrd2.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/dcSw_corsrd2.standard
rename to tests/hisimhv1/nmos/reference/dcSw_corsrd2.standard
diff --git a/tests/hisimhv/nmos/reference/dcSw_cosym.standard b/tests/hisimhv1/nmos/reference/dcSw_cosym.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/dcSw_cosym.standard
rename to tests/hisimhv1/nmos/reference/dcSw_cosym.standard
diff --git a/tests/hisimhv/nmos/reference/dcSw_gidl.standard b/tests/hisimhv1/nmos/reference/dcSw_gidl.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/dcSw_gidl.standard
rename to tests/hisimhv1/nmos/reference/dcSw_gidl.standard
diff --git a/tests/hisimhv/nmos/reference/dcSw_isub.standard b/tests/hisimhv1/nmos/reference/dcSw_isub.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/dcSw_isub.standard
rename to tests/hisimhv1/nmos/reference/dcSw_isub.standard
diff --git a/tests/hisimhv/nmos/reference/dcSw_ld2.standard b/tests/hisimhv1/nmos/reference/dcSw_ld2.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/dcSw_ld2.standard
rename to tests/hisimhv1/nmos/reference/dcSw_ld2.standard
diff --git a/tests/hisimhv/nmos/reference/dcSw_lg2.standard b/tests/hisimhv1/nmos/reference/dcSw_lg2.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/dcSw_lg2.standard
rename to tests/hisimhv1/nmos/reference/dcSw_lg2.standard
diff --git a/tests/hisimhv/nmos/reference/dcSw_rs2m.standard b/tests/hisimhv1/nmos/reference/dcSw_rs2m.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/dcSw_rs2m.standard
rename to tests/hisimhv1/nmos/reference/dcSw_rs2m.standard
diff --git a/tests/hisimhv/nmos/reference/dcSw_she.standard b/tests/hisimhv1/nmos/reference/dcSw_she.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/dcSw_she.standard
rename to tests/hisimhv1/nmos/reference/dcSw_she.standard
diff --git a/tests/hisimhv/nmos/reference/noise1.standard b/tests/hisimhv1/nmos/reference/noise1.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/noise1.standard
rename to tests/hisimhv1/nmos/reference/noise1.standard
diff --git a/tests/hisimhv/nmos/reference/noise2.standard b/tests/hisimhv1/nmos/reference/noise2.standard
similarity index 100%
rename from tests/hisimhv/nmos/reference/noise2.standard
rename to tests/hisimhv1/nmos/reference/noise2.standard
diff --git a/tests/hisimhv/nmos/run b/tests/hisimhv1/nmos/run
similarity index 100%
rename from tests/hisimhv/nmos/run
rename to tests/hisimhv1/nmos/run
diff --git a/tests/hisimhv/pmos/parameters/pmosParameters b/tests/hisimhv1/pmos/parameters/pmosParameters
similarity index 100%
rename from tests/hisimhv/pmos/parameters/pmosParameters
rename to tests/hisimhv1/pmos/parameters/pmosParameters
diff --git a/tests/hisimhv/pmos/qaSpec b/tests/hisimhv1/pmos/qaSpec
similarity index 100%
rename from tests/hisimhv/pmos/qaSpec
rename to tests/hisimhv1/pmos/qaSpec
diff --git a/tests/hisimhv/pmos/qaSpec.basic b/tests/hisimhv1/pmos/qaSpec.basic
similarity index 100%
rename from tests/hisimhv/pmos/qaSpec.basic
rename to tests/hisimhv1/pmos/qaSpec.basic
diff --git a/tests/hisimhv/pmos/reference/acFreq.standard b/tests/hisimhv1/pmos/reference/acFreq.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/acFreq.standard
rename to tests/hisimhv1/pmos/reference/acFreq.standard
diff --git a/tests/hisimhv/pmos/reference/acFreq_coadov.standard b/tests/hisimhv1/pmos/reference/acFreq_coadov.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/acFreq_coadov.standard
rename to tests/hisimhv1/pmos/reference/acFreq_coadov.standard
diff --git a/tests/hisimhv/pmos/reference/acFreq_coiigs.standard b/tests/hisimhv1/pmos/reference/acFreq_coiigs.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/acFreq_coiigs.standard
rename to tests/hisimhv1/pmos/reference/acFreq_coiigs.standard
diff --git a/tests/hisimhv/pmos/reference/acFreq_conqs.standard b/tests/hisimhv1/pmos/reference/acFreq_conqs.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/acFreq_conqs.standard
rename to tests/hisimhv1/pmos/reference/acFreq_conqs.standard
diff --git a/tests/hisimhv/pmos/reference/acFreq_coovlp.standard b/tests/hisimhv1/pmos/reference/acFreq_coovlp.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/acFreq_coovlp.standard
rename to tests/hisimhv1/pmos/reference/acFreq_coovlp.standard
diff --git a/tests/hisimhv/pmos/reference/acFreq_cosym.standard b/tests/hisimhv1/pmos/reference/acFreq_cosym.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/acFreq_cosym.standard
rename to tests/hisimhv1/pmos/reference/acFreq_cosym.standard
diff --git a/tests/hisimhv/pmos/reference/acFreq_nover.standard b/tests/hisimhv1/pmos/reference/acFreq_nover.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/acFreq_nover.standard
rename to tests/hisimhv1/pmos/reference/acFreq_nover.standard
diff --git a/tests/hisimhv/pmos/reference/acVd.standard b/tests/hisimhv1/pmos/reference/acVd.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/acVd.standard
rename to tests/hisimhv1/pmos/reference/acVd.standard
diff --git a/tests/hisimhv/pmos/reference/acVd_corsrd1.standard b/tests/hisimhv1/pmos/reference/acVd_corsrd1.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/acVd_corsrd1.standard
rename to tests/hisimhv1/pmos/reference/acVd_corsrd1.standard
diff --git a/tests/hisimhv/pmos/reference/acVd_corsrd2.standard b/tests/hisimhv1/pmos/reference/acVd_corsrd2.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/acVd_corsrd2.standard
rename to tests/hisimhv1/pmos/reference/acVd_corsrd2.standard
diff --git a/tests/hisimhv/pmos/reference/acVd_cosym.standard b/tests/hisimhv1/pmos/reference/acVd_cosym.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/acVd_cosym.standard
rename to tests/hisimhv1/pmos/reference/acVd_cosym.standard
diff --git a/tests/hisimhv/pmos/reference/acVd_cvdsover.standard b/tests/hisimhv1/pmos/reference/acVd_cvdsover.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/acVd_cvdsover.standard
rename to tests/hisimhv1/pmos/reference/acVd_cvdsover.standard
diff --git a/tests/hisimhv/pmos/reference/dcSw_Id1_vb0.standard b/tests/hisimhv1/pmos/reference/dcSw_Id1_vb0.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/dcSw_Id1_vb0.standard
rename to tests/hisimhv1/pmos/reference/dcSw_Id1_vb0.standard
diff --git a/tests/hisimhv/pmos/reference/dcSw_Id1_vb0_jd.standard b/tests/hisimhv1/pmos/reference/dcSw_Id1_vb0_jd.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/dcSw_Id1_vb0_jd.standard
rename to tests/hisimhv1/pmos/reference/dcSw_Id1_vb0_jd.standard
diff --git a/tests/hisimhv/pmos/reference/dcSw_Id1_vb1.standard b/tests/hisimhv1/pmos/reference/dcSw_Id1_vb1.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/dcSw_Id1_vb1.standard
rename to tests/hisimhv1/pmos/reference/dcSw_Id1_vb1.standard
diff --git a/tests/hisimhv/pmos/reference/dcSw_Id1_vb2.standard b/tests/hisimhv1/pmos/reference/dcSw_Id1_vb2.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/dcSw_Id1_vb2.standard
rename to tests/hisimhv1/pmos/reference/dcSw_Id1_vb2.standard
diff --git a/tests/hisimhv/pmos/reference/dcSw_Ig1_vb0.standard b/tests/hisimhv1/pmos/reference/dcSw_Ig1_vb0.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/dcSw_Ig1_vb0.standard
rename to tests/hisimhv1/pmos/reference/dcSw_Ig1_vb0.standard
diff --git a/tests/hisimhv/pmos/reference/dcSw_Ig1_vb0_jd.standard b/tests/hisimhv1/pmos/reference/dcSw_Ig1_vb0_jd.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/dcSw_Ig1_vb0_jd.standard
rename to tests/hisimhv1/pmos/reference/dcSw_Ig1_vb0_jd.standard
diff --git a/tests/hisimhv/pmos/reference/dcSw_Ig1_vb1.standard b/tests/hisimhv1/pmos/reference/dcSw_Ig1_vb1.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/dcSw_Ig1_vb1.standard
rename to tests/hisimhv1/pmos/reference/dcSw_Ig1_vb1.standard
diff --git a/tests/hisimhv/pmos/reference/dcSw_Ig1_vb2.standard b/tests/hisimhv1/pmos/reference/dcSw_Ig1_vb2.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/dcSw_Ig1_vb2.standard
rename to tests/hisimhv1/pmos/reference/dcSw_Ig1_vb2.standard
diff --git a/tests/hisimhv/pmos/reference/dcSw_corsrd0.standard b/tests/hisimhv1/pmos/reference/dcSw_corsrd0.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/dcSw_corsrd0.standard
rename to tests/hisimhv1/pmos/reference/dcSw_corsrd0.standard
diff --git a/tests/hisimhv/pmos/reference/dcSw_corsrd1.standard b/tests/hisimhv1/pmos/reference/dcSw_corsrd1.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/dcSw_corsrd1.standard
rename to tests/hisimhv1/pmos/reference/dcSw_corsrd1.standard
diff --git a/tests/hisimhv/pmos/reference/dcSw_corsrd2.standard b/tests/hisimhv1/pmos/reference/dcSw_corsrd2.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/dcSw_corsrd2.standard
rename to tests/hisimhv1/pmos/reference/dcSw_corsrd2.standard
diff --git a/tests/hisimhv/pmos/reference/dcSw_cosym.standard b/tests/hisimhv1/pmos/reference/dcSw_cosym.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/dcSw_cosym.standard
rename to tests/hisimhv1/pmos/reference/dcSw_cosym.standard
diff --git a/tests/hisimhv/pmos/reference/dcSw_gidl.standard b/tests/hisimhv1/pmos/reference/dcSw_gidl.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/dcSw_gidl.standard
rename to tests/hisimhv1/pmos/reference/dcSw_gidl.standard
diff --git a/tests/hisimhv/pmos/reference/dcSw_isub.standard b/tests/hisimhv1/pmos/reference/dcSw_isub.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/dcSw_isub.standard
rename to tests/hisimhv1/pmos/reference/dcSw_isub.standard
diff --git a/tests/hisimhv/pmos/reference/dcSw_ld2.standard b/tests/hisimhv1/pmos/reference/dcSw_ld2.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/dcSw_ld2.standard
rename to tests/hisimhv1/pmos/reference/dcSw_ld2.standard
diff --git a/tests/hisimhv/pmos/reference/dcSw_lg2.standard b/tests/hisimhv1/pmos/reference/dcSw_lg2.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/dcSw_lg2.standard
rename to tests/hisimhv1/pmos/reference/dcSw_lg2.standard
diff --git a/tests/hisimhv/pmos/reference/dcSw_rs2m.standard b/tests/hisimhv1/pmos/reference/dcSw_rs2m.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/dcSw_rs2m.standard
rename to tests/hisimhv1/pmos/reference/dcSw_rs2m.standard
diff --git a/tests/hisimhv/pmos/reference/dcSw_she.standard b/tests/hisimhv1/pmos/reference/dcSw_she.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/dcSw_she.standard
rename to tests/hisimhv1/pmos/reference/dcSw_she.standard
diff --git a/tests/hisimhv/pmos/reference/noise1.standard b/tests/hisimhv1/pmos/reference/noise1.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/noise1.standard
rename to tests/hisimhv1/pmos/reference/noise1.standard
diff --git a/tests/hisimhv/pmos/reference/noise2.standard b/tests/hisimhv1/pmos/reference/noise2.standard
similarity index 100%
rename from tests/hisimhv/pmos/reference/noise2.standard
rename to tests/hisimhv1/pmos/reference/noise2.standard
diff --git a/tests/hisimhv/pmos/run b/tests/hisimhv1/pmos/run
similarity index 100%
rename from tests/hisimhv/pmos/run
rename to tests/hisimhv1/pmos/run