diff --git a/sources/modules/VEPowertrainsAndFuels-previous/.Rbuildignore b/sources/modules/VEPowertrainsAndFuels-old/.Rbuildignore
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/.Rbuildignore
rename to sources/modules/VEPowertrainsAndFuels-old/.Rbuildignore
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/DESCRIPTION b/sources/modules/VEPowertrainsAndFuels-old/DESCRIPTION
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/DESCRIPTION
rename to sources/modules/VEPowertrainsAndFuels-old/DESCRIPTION
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/LICENSE b/sources/modules/VEPowertrainsAndFuels-old/LICENSE
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/LICENSE
rename to sources/modules/VEPowertrainsAndFuels-old/LICENSE
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/NAMESPACE b/sources/modules/VEPowertrainsAndFuels-old/NAMESPACE
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/NAMESPACE
rename to sources/modules/VEPowertrainsAndFuels-old/NAMESPACE
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/R/AssignHhVehiclePowertrain.R b/sources/modules/VEPowertrainsAndFuels-old/R/AssignHhVehiclePowertrain.R
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/R/AssignHhVehiclePowertrain.R
rename to sources/modules/VEPowertrainsAndFuels-old/R/AssignHhVehiclePowertrain.R
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/R/CalculateCarbonIntensity.R b/sources/modules/VEPowertrainsAndFuels-old/R/CalculateCarbonIntensity.R
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/R/CalculateCarbonIntensity.R
rename to sources/modules/VEPowertrainsAndFuels-old/R/CalculateCarbonIntensity.R
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/R/Initialize.R b/sources/modules/VEPowertrainsAndFuels-old/R/Initialize.R
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/R/Initialize.R
rename to sources/modules/VEPowertrainsAndFuels-old/R/Initialize.R
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/R/LoadDefaultValues.R b/sources/modules/VEPowertrainsAndFuels-old/R/LoadDefaultValues.R
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/R/LoadDefaultValues.R
rename to sources/modules/VEPowertrainsAndFuels-old/R/LoadDefaultValues.R
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/README.md b/sources/modules/VEPowertrainsAndFuels-old/README.md
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/README.md
rename to sources/modules/VEPowertrainsAndFuels-old/README.md
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/data/AssignHhVehiclePowertrainSpecifications.rda b/sources/modules/VEPowertrainsAndFuels-old/data/AssignHhVehiclePowertrainSpecifications.rda
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/data/AssignHhVehiclePowertrainSpecifications.rda
rename to sources/modules/VEPowertrainsAndFuels-old/data/AssignHhVehiclePowertrainSpecifications.rda
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/data/CalculateCarbonIntensitySpecifications.rda b/sources/modules/VEPowertrainsAndFuels-old/data/CalculateCarbonIntensitySpecifications.rda
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/data/CalculateCarbonIntensitySpecifications.rda
rename to sources/modules/VEPowertrainsAndFuels-old/data/CalculateCarbonIntensitySpecifications.rda
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/data/InitializeSpecifications.rda b/sources/modules/VEPowertrainsAndFuels-old/data/InitializeSpecifications.rda
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/data/InitializeSpecifications.rda
rename to sources/modules/VEPowertrainsAndFuels-old/data/InitializeSpecifications.rda
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/data/PhevElecProp_ls.rda b/sources/modules/VEPowertrainsAndFuels-old/data/PhevElecProp_ls.rda
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/data/PhevElecProp_ls.rda
rename to sources/modules/VEPowertrainsAndFuels-old/data/PhevElecProp_ls.rda
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/data/PowertrainFuelDefaults_ls.rda b/sources/modules/VEPowertrainsAndFuels-old/data/PowertrainFuelDefaults_ls.rda
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/data/PowertrainFuelDefaults_ls.rda
rename to sources/modules/VEPowertrainsAndFuels-old/data/PowertrainFuelDefaults_ls.rda
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/E&E_Defaults_&_Optional_Inputs.txt b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/E&E_Defaults_&_Optional_Inputs.txt
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/E&E_Defaults_&_Optional_Inputs.txt
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/E&E_Defaults_&_Optional_Inputs.txt
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/carbon_intensity.csv b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/carbon_intensity.csv
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/carbon_intensity.csv
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/carbon_intensity.csv
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/carbon_intensity.txt b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/carbon_intensity.txt
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/carbon_intensity.txt
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/carbon_intensity.txt
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/carsvc_fuel.csv b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/carsvc_fuel.csv
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/carsvc_fuel.csv
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/carsvc_fuel.csv
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/carsvc_fuel.txt b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/carsvc_fuel.txt
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/carsvc_fuel.txt
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/carsvc_fuel.txt
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/carsvc_powertrain_prop.csv b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/carsvc_powertrain_prop.csv
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/carsvc_powertrain_prop.csv
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/carsvc_powertrain_prop.csv
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/carsvc_powertrain_prop.txt b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/carsvc_powertrain_prop.txt
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/carsvc_powertrain_prop.txt
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/carsvc_powertrain_prop.txt
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/comsvc_fuel.csv b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/comsvc_fuel.csv
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/comsvc_fuel.csv
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/comsvc_fuel.csv
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/comsvc_fuel.txt b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/comsvc_fuel.txt
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/comsvc_fuel.txt
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/comsvc_fuel.txt
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/comsvc_powertrain_prop.csv b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/comsvc_powertrain_prop.csv
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/comsvc_powertrain_prop.csv
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/comsvc_powertrain_prop.csv
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/comsvc_powertrain_prop.txt b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/comsvc_powertrain_prop.txt
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/comsvc_powertrain_prop.txt
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/comsvc_powertrain_prop.txt
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/congestion_efficiency.csv b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/congestion_efficiency.csv
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/congestion_efficiency.csv
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/congestion_efficiency.csv
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/congestion_efficiency.txt b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/congestion_efficiency.txt
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/congestion_efficiency.txt
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/congestion_efficiency.txt
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hh_fuel.csv b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hh_fuel.csv
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hh_fuel.csv
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hh_fuel.csv
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hh_fuel.txt b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hh_fuel.txt
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hh_fuel.txt
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hh_fuel.txt
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hh_powertrain_prop.csv b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hh_powertrain_prop.csv
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hh_powertrain_prop.csv
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hh_powertrain_prop.csv
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hh_powertrain_prop.txt b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hh_powertrain_prop.txt
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hh_powertrain_prop.txt
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hh_powertrain_prop.txt
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hvytrk_biofuel_mix.csv b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hvytrk_biofuel_mix.csv
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hvytrk_biofuel_mix.csv
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hvytrk_biofuel_mix.csv
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hvytrk_biofuel_mix.txt b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hvytrk_biofuel_mix.txt
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hvytrk_biofuel_mix.txt
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hvytrk_biofuel_mix.txt
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hvytrk_fuel.csv b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hvytrk_fuel.csv
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hvytrk_fuel.csv
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hvytrk_fuel.csv
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hvytrk_fuel.txt b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hvytrk_fuel.txt
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hvytrk_fuel.txt
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hvytrk_fuel.txt
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hvytrk_powertrain_characteristics.csv b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hvytrk_powertrain_characteristics.csv
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hvytrk_powertrain_characteristics.csv
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hvytrk_powertrain_characteristics.csv
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hvytrk_powertrain_characteristics.txt b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hvytrk_powertrain_characteristics.txt
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hvytrk_powertrain_characteristics.txt
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hvytrk_powertrain_characteristics.txt
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hvytrk_powertrain_prop.csv b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hvytrk_powertrain_prop.csv
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hvytrk_powertrain_prop.csv
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hvytrk_powertrain_prop.csv
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hvytrk_powertrain_prop.txt b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hvytrk_powertrain_prop.txt
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/hvytrk_powertrain_prop.txt
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/hvytrk_powertrain_prop.txt
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/ldv_biofuel_mix.csv b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/ldv_biofuel_mix.csv
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/ldv_biofuel_mix.csv
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/ldv_biofuel_mix.csv
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/ldv_biofuel_mix.txt b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/ldv_biofuel_mix.txt
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/ldv_biofuel_mix.txt
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/ldv_biofuel_mix.txt
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/ldv_powertrain_characteristics.csv b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/ldv_powertrain_characteristics.csv
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/ldv_powertrain_characteristics.csv
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/ldv_powertrain_characteristics.csv
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/ldv_powertrain_characteristics.txt b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/ldv_powertrain_characteristics.txt
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/ldv_powertrain_characteristics.txt
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/ldv_powertrain_characteristics.txt
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/transit_biofuel_mix.csv b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/transit_biofuel_mix.csv
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/transit_biofuel_mix.csv
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/transit_biofuel_mix.csv
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/transit_biofuel_mix.txt b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/transit_biofuel_mix.txt
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/transit_biofuel_mix.txt
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/transit_biofuel_mix.txt
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/transit_fuel.csv b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/transit_fuel.csv
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/transit_fuel.csv
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/transit_fuel.csv
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/transit_fuel.txt b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/transit_fuel.txt
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/transit_fuel.txt
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/transit_fuel.txt
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/transit_powertrain_characteristics.csv b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/transit_powertrain_characteristics.csv
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/transit_powertrain_characteristics.csv
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/transit_powertrain_characteristics.csv
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/transit_powertrain_characteristics.txt b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/transit_powertrain_characteristics.txt
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/transit_powertrain_characteristics.txt
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/transit_powertrain_characteristics.txt
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/transit_powertrain_prop.csv b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/transit_powertrain_prop.csv
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/transit_powertrain_prop.csv
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/transit_powertrain_prop.csv
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/transit_powertrain_prop.txt b/sources/modules/VEPowertrainsAndFuels-old/inst/extdata/transit_powertrain_prop.txt
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/extdata/transit_powertrain_prop.txt
rename to sources/modules/VEPowertrainsAndFuels-old/inst/extdata/transit_powertrain_prop.txt
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/module_docs/AssignHhVehiclePowertrain.md b/sources/modules/VEPowertrainsAndFuels-old/inst/module_docs/AssignHhVehiclePowertrain.md
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/module_docs/AssignHhVehiclePowertrain.md
rename to sources/modules/VEPowertrainsAndFuels-old/inst/module_docs/AssignHhVehiclePowertrain.md
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/module_docs/CalculateCarbonIntensity.md b/sources/modules/VEPowertrainsAndFuels-old/inst/module_docs/CalculateCarbonIntensity.md
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/module_docs/CalculateCarbonIntensity.md
rename to sources/modules/VEPowertrainsAndFuels-old/inst/module_docs/CalculateCarbonIntensity.md
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/module_docs/Initialize.md b/sources/modules/VEPowertrainsAndFuels-old/inst/module_docs/Initialize.md
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/module_docs/Initialize.md
rename to sources/modules/VEPowertrainsAndFuels-old/inst/module_docs/Initialize.md
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/module_docs/LoadDefaultValues.md b/sources/modules/VEPowertrainsAndFuels-old/inst/module_docs/LoadDefaultValues.md
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/module_docs/LoadDefaultValues.md
rename to sources/modules/VEPowertrainsAndFuels-old/inst/module_docs/LoadDefaultValues.md
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/module_docs/metro_phev_elec_prop.png b/sources/modules/VEPowertrainsAndFuels-old/inst/module_docs/metro_phev_elec_prop.png
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/module_docs/metro_phev_elec_prop.png
rename to sources/modules/VEPowertrainsAndFuels-old/inst/module_docs/metro_phev_elec_prop.png
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/inst/module_docs/non-metro_phev_elec_prop.png b/sources/modules/VEPowertrainsAndFuels-old/inst/module_docs/non-metro_phev_elec_prop.png
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/inst/module_docs/non-metro_phev_elec_prop.png
rename to sources/modules/VEPowertrainsAndFuels-old/inst/module_docs/non-metro_phev_elec_prop.png
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/man/AssignHhVehiclePowertrain.Rd b/sources/modules/VEPowertrainsAndFuels-old/man/AssignHhVehiclePowertrain.Rd
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/man/AssignHhVehiclePowertrain.Rd
rename to sources/modules/VEPowertrainsAndFuels-old/man/AssignHhVehiclePowertrain.Rd
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/man/AssignHhVehiclePowertrainSpecifications.Rd b/sources/modules/VEPowertrainsAndFuels-old/man/AssignHhVehiclePowertrainSpecifications.Rd
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/man/AssignHhVehiclePowertrainSpecifications.Rd
rename to sources/modules/VEPowertrainsAndFuels-old/man/AssignHhVehiclePowertrainSpecifications.Rd
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/man/CalculateCarbonIntensity.Rd b/sources/modules/VEPowertrainsAndFuels-old/man/CalculateCarbonIntensity.Rd
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/man/CalculateCarbonIntensity.Rd
rename to sources/modules/VEPowertrainsAndFuels-old/man/CalculateCarbonIntensity.Rd
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/man/CalculateCarbonIntensitySpecifications.Rd b/sources/modules/VEPowertrainsAndFuels-old/man/CalculateCarbonIntensitySpecifications.Rd
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/man/CalculateCarbonIntensitySpecifications.Rd
rename to sources/modules/VEPowertrainsAndFuels-old/man/CalculateCarbonIntensitySpecifications.Rd
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/man/DataPresent.Rd b/sources/modules/VEPowertrainsAndFuels-old/man/DataPresent.Rd
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/man/DataPresent.Rd
rename to sources/modules/VEPowertrainsAndFuels-old/man/DataPresent.Rd
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/man/Initialize.Rd b/sources/modules/VEPowertrainsAndFuels-old/man/Initialize.Rd
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/man/Initialize.Rd
rename to sources/modules/VEPowertrainsAndFuels-old/man/Initialize.Rd
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/man/InitializeSpecifications.Rd b/sources/modules/VEPowertrainsAndFuels-old/man/InitializeSpecifications.Rd
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/man/InitializeSpecifications.Rd
rename to sources/modules/VEPowertrainsAndFuels-old/man/InitializeSpecifications.Rd
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/man/PhevElecProp_ls.Rd b/sources/modules/VEPowertrainsAndFuels-old/man/PhevElecProp_ls.Rd
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/man/PhevElecProp_ls.Rd
rename to sources/modules/VEPowertrainsAndFuels-old/man/PhevElecProp_ls.Rd
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/man/PowertrainFuelDefaults_ls.Rd b/sources/modules/VEPowertrainsAndFuels-old/man/PowertrainFuelDefaults_ls.Rd
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/man/PowertrainFuelDefaults_ls.Rd
rename to sources/modules/VEPowertrainsAndFuels-old/man/PowertrainFuelDefaults_ls.Rd
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/man/calcAverageFuelCI.Rd b/sources/modules/VEPowertrainsAndFuels-old/man/calcAverageFuelCI.Rd
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/man/calcAverageFuelCI.Rd
rename to sources/modules/VEPowertrainsAndFuels-old/man/calcAverageFuelCI.Rd
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/man/filterOnNames.Rd b/sources/modules/VEPowertrainsAndFuels-old/man/filterOnNames.Rd
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/man/filterOnNames.Rd
rename to sources/modules/VEPowertrainsAndFuels-old/man/filterOnNames.Rd
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/man/interpolate.Rd b/sources/modules/VEPowertrainsAndFuels-old/man/interpolate.Rd
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/man/interpolate.Rd
rename to sources/modules/VEPowertrainsAndFuels-old/man/interpolate.Rd
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/man/interpolateDfVals.Rd b/sources/modules/VEPowertrainsAndFuels-old/man/interpolateDfVals.Rd
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/man/interpolateDfVals.Rd
rename to sources/modules/VEPowertrainsAndFuels-old/man/interpolateDfVals.Rd
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/tests/scripts/analyze.R b/sources/modules/VEPowertrainsAndFuels-old/tests/scripts/analyze.R
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/tests/scripts/analyze.R
rename to sources/modules/VEPowertrainsAndFuels-old/tests/scripts/analyze.R
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/tests/scripts/test.R b/sources/modules/VEPowertrainsAndFuels-old/tests/scripts/test.R
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/tests/scripts/test.R
rename to sources/modules/VEPowertrainsAndFuels-old/tests/scripts/test.R
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/tests/scripts/test_functions.R b/sources/modules/VEPowertrainsAndFuels-old/tests/scripts/test_functions.R
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/tests/scripts/test_functions.R
rename to sources/modules/VEPowertrainsAndFuels-old/tests/scripts/test_functions.R
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/tests/scripts/veclmpo_test.R b/sources/modules/VEPowertrainsAndFuels-old/tests/scripts/veclmpo_test.R
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/tests/scripts/veclmpo_test.R
rename to sources/modules/VEPowertrainsAndFuels-old/tests/scripts/veclmpo_test.R
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/tests/scripts/verspm_test.R b/sources/modules/VEPowertrainsAndFuels-old/tests/scripts/verspm_test.R
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/tests/scripts/verspm_test.R
rename to sources/modules/VEPowertrainsAndFuels-old/tests/scripts/verspm_test.R
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/tests/scripts/vestate_test.R b/sources/modules/VEPowertrainsAndFuels-old/tests/scripts/vestate_test.R
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/tests/scripts/vestate_test.R
rename to sources/modules/VEPowertrainsAndFuels-old/tests/scripts/vestate_test.R
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/tests/veclmpo/ModelState.Rda b/sources/modules/VEPowertrainsAndFuels-old/tests/veclmpo/ModelState.Rda
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/tests/veclmpo/ModelState.Rda
rename to sources/modules/VEPowertrainsAndFuels-old/tests/veclmpo/ModelState.Rda
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/tests/verspm/ModelState.Rda b/sources/modules/VEPowertrainsAndFuels-old/tests/verspm/ModelState.Rda
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/tests/verspm/ModelState.Rda
rename to sources/modules/VEPowertrainsAndFuels-old/tests/verspm/ModelState.Rda
diff --git a/sources/modules/VEPowertrainsAndFuels-previous/tests/vestate/ModelState.Rda b/sources/modules/VEPowertrainsAndFuels-old/tests/vestate/ModelState.Rda
similarity index 100%
rename from sources/modules/VEPowertrainsAndFuels-previous/tests/vestate/ModelState.Rda
rename to sources/modules/VEPowertrainsAndFuels-old/tests/vestate/ModelState.Rda