diff --git a/SimpleEnergyModel/Data_SimpleEnergyModel.xlsx b/model/Data_SimpleEnergyModel.xlsx
similarity index 100%
rename from SimpleEnergyModel/Data_SimpleEnergyModel.xlsx
rename to model/Data_SimpleEnergyModel.xlsx
diff --git a/SimpleEnergyModel/Visualisation.py b/model/Visualisation.py
similarity index 100%
rename from SimpleEnergyModel/Visualisation.py
rename to model/Visualisation.py
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/AccumulatedAnnualDemand.csv b/model/gas/data/AccumulatedAnnualDemand.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/AccumulatedAnnualDemand.csv
rename to model/gas/data/AccumulatedAnnualDemand.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/AnnualEmissionLimit.csv b/model/gas/data/AnnualEmissionLimit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/AnnualEmissionLimit.csv
rename to model/gas/data/AnnualEmissionLimit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/AnnualExogenousEmission.csv b/model/gas/data/AnnualExogenousEmission.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/AnnualExogenousEmission.csv
rename to model/gas/data/AnnualExogenousEmission.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/AvailabilityFactor.csv b/model/gas/data/AvailabilityFactor.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/AvailabilityFactor.csv
rename to model/gas/data/AvailabilityFactor.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/CapacityFactor.csv b/model/gas/data/CapacityFactor.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/CapacityFactor.csv
rename to model/gas/data/CapacityFactor.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/CapacityOfOneTechnologyUnit.csv b/model/gas/data/CapacityOfOneTechnologyUnit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/CapacityOfOneTechnologyUnit.csv
rename to model/gas/data/CapacityOfOneTechnologyUnit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/CapacityToActivityUnit.csv b/model/gas/data/CapacityToActivityUnit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/CapacityToActivityUnit.csv
rename to model/gas/data/CapacityToActivityUnit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/CapitalCost.csv b/model/gas/data/CapitalCost.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/CapitalCost.csv
rename to model/gas/data/CapitalCost.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/CapitalCostStorage.csv b/model/gas/data/CapitalCostStorage.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/CapitalCostStorage.csv
rename to model/gas/data/CapitalCostStorage.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/Conversionld.csv b/model/gas/data/Conversionld.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/Conversionld.csv
rename to model/gas/data/Conversionld.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/Conversionlh.csv b/model/gas/data/Conversionlh.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/Conversionlh.csv
rename to model/gas/data/Conversionlh.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/Conversionls.csv b/model/gas/data/Conversionls.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/Conversionls.csv
rename to model/gas/data/Conversionls.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/DAILYTIMEBRACKET.csv b/model/gas/data/DAILYTIMEBRACKET.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/DAILYTIMEBRACKET.csv
rename to model/gas/data/DAILYTIMEBRACKET.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/DAYTYPE.csv b/model/gas/data/DAYTYPE.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/DAYTYPE.csv
rename to model/gas/data/DAYTYPE.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/DaySplit.csv b/model/gas/data/DaySplit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/DaySplit.csv
rename to model/gas/data/DaySplit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/DaysInDayType.csv b/model/gas/data/DaysInDayType.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/DaysInDayType.csv
rename to model/gas/data/DaysInDayType.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/DepreciationMethod.csv b/model/gas/data/DepreciationMethod.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/DepreciationMethod.csv
rename to model/gas/data/DepreciationMethod.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/DiscountRate.csv b/model/gas/data/DiscountRate.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/DiscountRate.csv
rename to model/gas/data/DiscountRate.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/DiscountRateStorage.csv b/model/gas/data/DiscountRateStorage.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/DiscountRateStorage.csv
rename to model/gas/data/DiscountRateStorage.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/EMISSION.csv b/model/gas/data/EMISSION.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/EMISSION.csv
rename to model/gas/data/EMISSION.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/EmissionActivityRatio.csv b/model/gas/data/EmissionActivityRatio.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/EmissionActivityRatio.csv
rename to model/gas/data/EmissionActivityRatio.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/EmissionsPenalty.csv b/model/gas/data/EmissionsPenalty.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/EmissionsPenalty.csv
rename to model/gas/data/EmissionsPenalty.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/FUEL.csv b/model/gas/data/FUEL.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/FUEL.csv
rename to model/gas/data/FUEL.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/FixedCost.csv b/model/gas/data/FixedCost.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/FixedCost.csv
rename to model/gas/data/FixedCost.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/InputActivityRatio.csv b/model/gas/data/InputActivityRatio.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/InputActivityRatio.csv
rename to model/gas/data/InputActivityRatio.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/MODE_OF_OPERATION.csv b/model/gas/data/MODE_OF_OPERATION.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/MODE_OF_OPERATION.csv
rename to model/gas/data/MODE_OF_OPERATION.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/MinStorageCharge.csv b/model/gas/data/MinStorageCharge.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/MinStorageCharge.csv
rename to model/gas/data/MinStorageCharge.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/ModelPeriodEmissionLimit.csv b/model/gas/data/ModelPeriodEmissionLimit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/ModelPeriodEmissionLimit.csv
rename to model/gas/data/ModelPeriodEmissionLimit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/ModelPeriodExogenousEmission.csv b/model/gas/data/ModelPeriodExogenousEmission.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/ModelPeriodExogenousEmission.csv
rename to model/gas/data/ModelPeriodExogenousEmission.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/OperationalLife.csv b/model/gas/data/OperationalLife.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/OperationalLife.csv
rename to model/gas/data/OperationalLife.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/OperationalLifeStorage.csv b/model/gas/data/OperationalLifeStorage.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/OperationalLifeStorage.csv
rename to model/gas/data/OperationalLifeStorage.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/OutputActivityRatio.csv b/model/gas/data/OutputActivityRatio.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/OutputActivityRatio.csv
rename to model/gas/data/OutputActivityRatio.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/REGION.csv b/model/gas/data/REGION.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/REGION.csv
rename to model/gas/data/REGION.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/REMinProductionTarget.csv b/model/gas/data/REMinProductionTarget.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/REMinProductionTarget.csv
rename to model/gas/data/REMinProductionTarget.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/RETagFuel.csv b/model/gas/data/RETagFuel.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/RETagFuel.csv
rename to model/gas/data/RETagFuel.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/RETagTechnology.csv b/model/gas/data/RETagTechnology.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/RETagTechnology.csv
rename to model/gas/data/RETagTechnology.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/ReserveMargin.csv b/model/gas/data/ReserveMargin.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/ReserveMargin.csv
rename to model/gas/data/ReserveMargin.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/ReserveMarginTagFuel.csv b/model/gas/data/ReserveMarginTagFuel.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/ReserveMarginTagFuel.csv
rename to model/gas/data/ReserveMarginTagFuel.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/ReserveMarginTagTechnology.csv b/model/gas/data/ReserveMarginTagTechnology.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/ReserveMarginTagTechnology.csv
rename to model/gas/data/ReserveMarginTagTechnology.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/ResidualCapacity.csv b/model/gas/data/ResidualCapacity.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/ResidualCapacity.csv
rename to model/gas/data/ResidualCapacity.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/ResidualStorageCapacity.csv b/model/gas/data/ResidualStorageCapacity.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/ResidualStorageCapacity.csv
rename to model/gas/data/ResidualStorageCapacity.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/SEASON.csv b/model/gas/data/SEASON.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/SEASON.csv
rename to model/gas/data/SEASON.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/STORAGE.csv b/model/gas/data/STORAGE.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/STORAGE.csv
rename to model/gas/data/STORAGE.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/SpecifiedAnnualDemand.csv b/model/gas/data/SpecifiedAnnualDemand.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/SpecifiedAnnualDemand.csv
rename to model/gas/data/SpecifiedAnnualDemand.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/SpecifiedDemandProfile.csv b/model/gas/data/SpecifiedDemandProfile.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/SpecifiedDemandProfile.csv
rename to model/gas/data/SpecifiedDemandProfile.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/StorageLevelStart.csv b/model/gas/data/StorageLevelStart.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/StorageLevelStart.csv
rename to model/gas/data/StorageLevelStart.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/StorageMaxChargeRate.csv b/model/gas/data/StorageMaxChargeRate.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/StorageMaxChargeRate.csv
rename to model/gas/data/StorageMaxChargeRate.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/StorageMaxDischargeRate.csv b/model/gas/data/StorageMaxDischargeRate.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/StorageMaxDischargeRate.csv
rename to model/gas/data/StorageMaxDischargeRate.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/TECHNOLOGY.csv b/model/gas/data/TECHNOLOGY.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/TECHNOLOGY.csv
rename to model/gas/data/TECHNOLOGY.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/TIMESLICE.csv b/model/gas/data/TIMESLICE.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/TIMESLICE.csv
rename to model/gas/data/TIMESLICE.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/TechnologyFromStorage.csv b/model/gas/data/TechnologyFromStorage.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/TechnologyFromStorage.csv
rename to model/gas/data/TechnologyFromStorage.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/TechnologyToStorage.csv b/model/gas/data/TechnologyToStorage.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/TechnologyToStorage.csv
rename to model/gas/data/TechnologyToStorage.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/TotalAnnualMaxCapacity.csv b/model/gas/data/TotalAnnualMaxCapacity.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/TotalAnnualMaxCapacity.csv
rename to model/gas/data/TotalAnnualMaxCapacity.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/TotalAnnualMaxCapacityInvestment.csv b/model/gas/data/TotalAnnualMaxCapacityInvestment.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/TotalAnnualMaxCapacityInvestment.csv
rename to model/gas/data/TotalAnnualMaxCapacityInvestment.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/TotalAnnualMinCapacity.csv b/model/gas/data/TotalAnnualMinCapacity.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/TotalAnnualMinCapacity.csv
rename to model/gas/data/TotalAnnualMinCapacity.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/TotalAnnualMinCapacityInvestment.csv b/model/gas/data/TotalAnnualMinCapacityInvestment.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/TotalAnnualMinCapacityInvestment.csv
rename to model/gas/data/TotalAnnualMinCapacityInvestment.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/TotalTechnologyAnnualActivityLowerLimit.csv b/model/gas/data/TotalTechnologyAnnualActivityLowerLimit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/TotalTechnologyAnnualActivityLowerLimit.csv
rename to model/gas/data/TotalTechnologyAnnualActivityLowerLimit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/TotalTechnologyAnnualActivityUpperLimit.csv b/model/gas/data/TotalTechnologyAnnualActivityUpperLimit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/TotalTechnologyAnnualActivityUpperLimit.csv
rename to model/gas/data/TotalTechnologyAnnualActivityUpperLimit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/TotalTechnologyModelPeriodActivityLowerLimit.csv b/model/gas/data/TotalTechnologyModelPeriodActivityLowerLimit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/TotalTechnologyModelPeriodActivityLowerLimit.csv
rename to model/gas/data/TotalTechnologyModelPeriodActivityLowerLimit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/TotalTechnologyModelPeriodActivityUpperLimit.csv b/model/gas/data/TotalTechnologyModelPeriodActivityUpperLimit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/TotalTechnologyModelPeriodActivityUpperLimit.csv
rename to model/gas/data/TotalTechnologyModelPeriodActivityUpperLimit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/TradeRoute.csv b/model/gas/data/TradeRoute.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/TradeRoute.csv
rename to model/gas/data/TradeRoute.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/VariableCost.csv b/model/gas/data/VariableCost.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/VariableCost.csv
rename to model/gas/data/VariableCost.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/YEAR.csv b/model/gas/data/YEAR.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/YEAR.csv
rename to model/gas/data/YEAR.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/YearSplit.csv b/model/gas/data/YearSplit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/YearSplit.csv
rename to model/gas/data/YearSplit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/data/default_values.csv b/model/gas/data/default_values.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/data/default_values.csv
rename to model/gas/data/default_values.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_Gas/datapackage.json b/model/gas/datapackage.json
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_Gas/datapackage.json
rename to model/gas/datapackage.json
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/AccumulatedAnnualDemand.csv b/model/gas_solar/data/AccumulatedAnnualDemand.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/AccumulatedAnnualDemand.csv
rename to model/gas_solar/data/AccumulatedAnnualDemand.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/AnnualEmissionLimit.csv b/model/gas_solar/data/AnnualEmissionLimit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/AnnualEmissionLimit.csv
rename to model/gas_solar/data/AnnualEmissionLimit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/AnnualExogenousEmission.csv b/model/gas_solar/data/AnnualExogenousEmission.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/AnnualExogenousEmission.csv
rename to model/gas_solar/data/AnnualExogenousEmission.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/AvailabilityFactor.csv b/model/gas_solar/data/AvailabilityFactor.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/AvailabilityFactor.csv
rename to model/gas_solar/data/AvailabilityFactor.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/CapacityFactor.csv b/model/gas_solar/data/CapacityFactor.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/CapacityFactor.csv
rename to model/gas_solar/data/CapacityFactor.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/CapacityOfOneTechnologyUnit.csv b/model/gas_solar/data/CapacityOfOneTechnologyUnit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/CapacityOfOneTechnologyUnit.csv
rename to model/gas_solar/data/CapacityOfOneTechnologyUnit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/CapacityToActivityUnit.csv b/model/gas_solar/data/CapacityToActivityUnit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/CapacityToActivityUnit.csv
rename to model/gas_solar/data/CapacityToActivityUnit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/CapitalCost.csv b/model/gas_solar/data/CapitalCost.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/CapitalCost.csv
rename to model/gas_solar/data/CapitalCost.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/CapitalCostStorage.csv b/model/gas_solar/data/CapitalCostStorage.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/CapitalCostStorage.csv
rename to model/gas_solar/data/CapitalCostStorage.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/Conversionld.csv b/model/gas_solar/data/Conversionld.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/Conversionld.csv
rename to model/gas_solar/data/Conversionld.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/Conversionlh.csv b/model/gas_solar/data/Conversionlh.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/Conversionlh.csv
rename to model/gas_solar/data/Conversionlh.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/Conversionls.csv b/model/gas_solar/data/Conversionls.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/Conversionls.csv
rename to model/gas_solar/data/Conversionls.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/DAILYTIMEBRACKET.csv b/model/gas_solar/data/DAILYTIMEBRACKET.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/DAILYTIMEBRACKET.csv
rename to model/gas_solar/data/DAILYTIMEBRACKET.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/DAYTYPE.csv b/model/gas_solar/data/DAYTYPE.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/DAYTYPE.csv
rename to model/gas_solar/data/DAYTYPE.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/DaySplit.csv b/model/gas_solar/data/DaySplit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/DaySplit.csv
rename to model/gas_solar/data/DaySplit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/DaysInDayType.csv b/model/gas_solar/data/DaysInDayType.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/DaysInDayType.csv
rename to model/gas_solar/data/DaysInDayType.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/DepreciationMethod.csv b/model/gas_solar/data/DepreciationMethod.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/DepreciationMethod.csv
rename to model/gas_solar/data/DepreciationMethod.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/DiscountRate.csv b/model/gas_solar/data/DiscountRate.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/DiscountRate.csv
rename to model/gas_solar/data/DiscountRate.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/EMISSION.csv b/model/gas_solar/data/EMISSION.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/EMISSION.csv
rename to model/gas_solar/data/EMISSION.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/EmissionActivityRatio.csv b/model/gas_solar/data/EmissionActivityRatio.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/EmissionActivityRatio.csv
rename to model/gas_solar/data/EmissionActivityRatio.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/EmissionsPenalty.csv b/model/gas_solar/data/EmissionsPenalty.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/EmissionsPenalty.csv
rename to model/gas_solar/data/EmissionsPenalty.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/FUEL.csv b/model/gas_solar/data/FUEL.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/FUEL.csv
rename to model/gas_solar/data/FUEL.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/FixedCost.csv b/model/gas_solar/data/FixedCost.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/FixedCost.csv
rename to model/gas_solar/data/FixedCost.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/InputActivityRatio.csv b/model/gas_solar/data/InputActivityRatio.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/InputActivityRatio.csv
rename to model/gas_solar/data/InputActivityRatio.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/MODE_OF_OPERATION.csv b/model/gas_solar/data/MODE_OF_OPERATION.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/MODE_OF_OPERATION.csv
rename to model/gas_solar/data/MODE_OF_OPERATION.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/MinStorageCharge.csv b/model/gas_solar/data/MinStorageCharge.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/MinStorageCharge.csv
rename to model/gas_solar/data/MinStorageCharge.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/ModelPeriodEmissionLimit.csv b/model/gas_solar/data/ModelPeriodEmissionLimit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/ModelPeriodEmissionLimit.csv
rename to model/gas_solar/data/ModelPeriodEmissionLimit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/ModelPeriodExogenousEmission.csv b/model/gas_solar/data/ModelPeriodExogenousEmission.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/ModelPeriodExogenousEmission.csv
rename to model/gas_solar/data/ModelPeriodExogenousEmission.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/OperationalLife.csv b/model/gas_solar/data/OperationalLife.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/OperationalLife.csv
rename to model/gas_solar/data/OperationalLife.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/OperationalLifeStorage.csv b/model/gas_solar/data/OperationalLifeStorage.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/OperationalLifeStorage.csv
rename to model/gas_solar/data/OperationalLifeStorage.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/OutputActivityRatio.csv b/model/gas_solar/data/OutputActivityRatio.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/OutputActivityRatio.csv
rename to model/gas_solar/data/OutputActivityRatio.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/REGION.csv b/model/gas_solar/data/REGION.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/REGION.csv
rename to model/gas_solar/data/REGION.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/REMinProductionTarget.csv b/model/gas_solar/data/REMinProductionTarget.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/REMinProductionTarget.csv
rename to model/gas_solar/data/REMinProductionTarget.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/RETagFuel.csv b/model/gas_solar/data/RETagFuel.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/RETagFuel.csv
rename to model/gas_solar/data/RETagFuel.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/RETagTechnology.csv b/model/gas_solar/data/RETagTechnology.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/RETagTechnology.csv
rename to model/gas_solar/data/RETagTechnology.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/ReserveMargin.csv b/model/gas_solar/data/ReserveMargin.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/ReserveMargin.csv
rename to model/gas_solar/data/ReserveMargin.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/ReserveMarginTagFuel.csv b/model/gas_solar/data/ReserveMarginTagFuel.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/ReserveMarginTagFuel.csv
rename to model/gas_solar/data/ReserveMarginTagFuel.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/ReserveMarginTagTechnology.csv b/model/gas_solar/data/ReserveMarginTagTechnology.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/ReserveMarginTagTechnology.csv
rename to model/gas_solar/data/ReserveMarginTagTechnology.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/ResidualCapacity.csv b/model/gas_solar/data/ResidualCapacity.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/ResidualCapacity.csv
rename to model/gas_solar/data/ResidualCapacity.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/ResidualStorageCapacity.csv b/model/gas_solar/data/ResidualStorageCapacity.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/ResidualStorageCapacity.csv
rename to model/gas_solar/data/ResidualStorageCapacity.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/SEASON.csv b/model/gas_solar/data/SEASON.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/SEASON.csv
rename to model/gas_solar/data/SEASON.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/STORAGE.csv b/model/gas_solar/data/STORAGE.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/STORAGE.csv
rename to model/gas_solar/data/STORAGE.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/SpecifiedAnnualDemand.csv b/model/gas_solar/data/SpecifiedAnnualDemand.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/SpecifiedAnnualDemand.csv
rename to model/gas_solar/data/SpecifiedAnnualDemand.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/SpecifiedDemandProfile.csv b/model/gas_solar/data/SpecifiedDemandProfile.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/SpecifiedDemandProfile.csv
rename to model/gas_solar/data/SpecifiedDemandProfile.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/StorageLevelStart.csv b/model/gas_solar/data/StorageLevelStart.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/StorageLevelStart.csv
rename to model/gas_solar/data/StorageLevelStart.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/StorageMaxChargeRate.csv b/model/gas_solar/data/StorageMaxChargeRate.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/StorageMaxChargeRate.csv
rename to model/gas_solar/data/StorageMaxChargeRate.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/StorageMaxDischargeRate.csv b/model/gas_solar/data/StorageMaxDischargeRate.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/StorageMaxDischargeRate.csv
rename to model/gas_solar/data/StorageMaxDischargeRate.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TECHNOLOGY.csv b/model/gas_solar/data/TECHNOLOGY.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TECHNOLOGY.csv
rename to model/gas_solar/data/TECHNOLOGY.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TIMESLICE.csv b/model/gas_solar/data/TIMESLICE.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TIMESLICE.csv
rename to model/gas_solar/data/TIMESLICE.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TechnologyFromStorage.csv b/model/gas_solar/data/TechnologyFromStorage.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TechnologyFromStorage.csv
rename to model/gas_solar/data/TechnologyFromStorage.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TechnologyToStorage.csv b/model/gas_solar/data/TechnologyToStorage.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TechnologyToStorage.csv
rename to model/gas_solar/data/TechnologyToStorage.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TotalAnnualMaxCapacity.csv b/model/gas_solar/data/TotalAnnualMaxCapacity.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TotalAnnualMaxCapacity.csv
rename to model/gas_solar/data/TotalAnnualMaxCapacity.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TotalAnnualMaxCapacityInvestment.csv b/model/gas_solar/data/TotalAnnualMaxCapacityInvestment.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TotalAnnualMaxCapacityInvestment.csv
rename to model/gas_solar/data/TotalAnnualMaxCapacityInvestment.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TotalAnnualMinCapacity.csv b/model/gas_solar/data/TotalAnnualMinCapacity.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TotalAnnualMinCapacity.csv
rename to model/gas_solar/data/TotalAnnualMinCapacity.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TotalAnnualMinCapacityInvestment.csv b/model/gas_solar/data/TotalAnnualMinCapacityInvestment.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TotalAnnualMinCapacityInvestment.csv
rename to model/gas_solar/data/TotalAnnualMinCapacityInvestment.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TotalTechnologyAnnualActivityLowerLimit.csv b/model/gas_solar/data/TotalTechnologyAnnualActivityLowerLimit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TotalTechnologyAnnualActivityLowerLimit.csv
rename to model/gas_solar/data/TotalTechnologyAnnualActivityLowerLimit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TotalTechnologyAnnualActivityUpperLimit.csv b/model/gas_solar/data/TotalTechnologyAnnualActivityUpperLimit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TotalTechnologyAnnualActivityUpperLimit.csv
rename to model/gas_solar/data/TotalTechnologyAnnualActivityUpperLimit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TotalTechnologyModelPeriodActivityLowerLimit.csv b/model/gas_solar/data/TotalTechnologyModelPeriodActivityLowerLimit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TotalTechnologyModelPeriodActivityLowerLimit.csv
rename to model/gas_solar/data/TotalTechnologyModelPeriodActivityLowerLimit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TotalTechnologyModelPeriodActivityUpperLimit.csv b/model/gas_solar/data/TotalTechnologyModelPeriodActivityUpperLimit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TotalTechnologyModelPeriodActivityUpperLimit.csv
rename to model/gas_solar/data/TotalTechnologyModelPeriodActivityUpperLimit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TradeRoute.csv b/model/gas_solar/data/TradeRoute.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/TradeRoute.csv
rename to model/gas_solar/data/TradeRoute.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/VariableCost.csv b/model/gas_solar/data/VariableCost.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/VariableCost.csv
rename to model/gas_solar/data/VariableCost.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/YEAR.csv b/model/gas_solar/data/YEAR.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/YEAR.csv
rename to model/gas_solar/data/YEAR.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/YearSplit.csv b/model/gas_solar/data/YearSplit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/YearSplit.csv
rename to model/gas_solar/data/YearSplit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/default_values.csv b/model/gas_solar/data/default_values.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/data/default_values.csv
rename to model/gas_solar/data/default_values.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolar/datapackage.json b/model/gas_solar/datapackage.json
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolar/datapackage.json
rename to model/gas_solar/datapackage.json
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/AccumulatedAnnualDemand.csv b/model/gas_solar_wind/data/AccumulatedAnnualDemand.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/AccumulatedAnnualDemand.csv
rename to model/gas_solar_wind/data/AccumulatedAnnualDemand.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/AnnualEmissionLimit.csv b/model/gas_solar_wind/data/AnnualEmissionLimit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/AnnualEmissionLimit.csv
rename to model/gas_solar_wind/data/AnnualEmissionLimit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/AnnualExogenousEmission.csv b/model/gas_solar_wind/data/AnnualExogenousEmission.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/AnnualExogenousEmission.csv
rename to model/gas_solar_wind/data/AnnualExogenousEmission.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/AvailabilityFactor.csv b/model/gas_solar_wind/data/AvailabilityFactor.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/AvailabilityFactor.csv
rename to model/gas_solar_wind/data/AvailabilityFactor.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/CapacityFactor.csv b/model/gas_solar_wind/data/CapacityFactor.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/CapacityFactor.csv
rename to model/gas_solar_wind/data/CapacityFactor.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/CapacityOfOneTechnologyUnit.csv b/model/gas_solar_wind/data/CapacityOfOneTechnologyUnit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/CapacityOfOneTechnologyUnit.csv
rename to model/gas_solar_wind/data/CapacityOfOneTechnologyUnit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/CapacityToActivityUnit.csv b/model/gas_solar_wind/data/CapacityToActivityUnit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/CapacityToActivityUnit.csv
rename to model/gas_solar_wind/data/CapacityToActivityUnit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/CapitalCost.csv b/model/gas_solar_wind/data/CapitalCost.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/CapitalCost.csv
rename to model/gas_solar_wind/data/CapitalCost.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/CapitalCostStorage.csv b/model/gas_solar_wind/data/CapitalCostStorage.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/CapitalCostStorage.csv
rename to model/gas_solar_wind/data/CapitalCostStorage.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/Conversionld.csv b/model/gas_solar_wind/data/Conversionld.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/Conversionld.csv
rename to model/gas_solar_wind/data/Conversionld.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/Conversionlh.csv b/model/gas_solar_wind/data/Conversionlh.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/Conversionlh.csv
rename to model/gas_solar_wind/data/Conversionlh.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/Conversionls.csv b/model/gas_solar_wind/data/Conversionls.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/Conversionls.csv
rename to model/gas_solar_wind/data/Conversionls.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/DAILYTIMEBRACKET.csv b/model/gas_solar_wind/data/DAILYTIMEBRACKET.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/DAILYTIMEBRACKET.csv
rename to model/gas_solar_wind/data/DAILYTIMEBRACKET.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/DAYTYPE.csv b/model/gas_solar_wind/data/DAYTYPE.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/DAYTYPE.csv
rename to model/gas_solar_wind/data/DAYTYPE.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/DaySplit.csv b/model/gas_solar_wind/data/DaySplit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/DaySplit.csv
rename to model/gas_solar_wind/data/DaySplit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/DaysInDayType.csv b/model/gas_solar_wind/data/DaysInDayType.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/DaysInDayType.csv
rename to model/gas_solar_wind/data/DaysInDayType.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/DepreciationMethod.csv b/model/gas_solar_wind/data/DepreciationMethod.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/DepreciationMethod.csv
rename to model/gas_solar_wind/data/DepreciationMethod.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/DiscountRate.csv b/model/gas_solar_wind/data/DiscountRate.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/DiscountRate.csv
rename to model/gas_solar_wind/data/DiscountRate.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/EMISSION.csv b/model/gas_solar_wind/data/EMISSION.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/EMISSION.csv
rename to model/gas_solar_wind/data/EMISSION.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/EmissionActivityRatio.csv b/model/gas_solar_wind/data/EmissionActivityRatio.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/EmissionActivityRatio.csv
rename to model/gas_solar_wind/data/EmissionActivityRatio.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/EmissionsPenalty.csv b/model/gas_solar_wind/data/EmissionsPenalty.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/EmissionsPenalty.csv
rename to model/gas_solar_wind/data/EmissionsPenalty.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/FUEL.csv b/model/gas_solar_wind/data/FUEL.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/FUEL.csv
rename to model/gas_solar_wind/data/FUEL.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/FixedCost.csv b/model/gas_solar_wind/data/FixedCost.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/FixedCost.csv
rename to model/gas_solar_wind/data/FixedCost.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/InputActivityRatio.csv b/model/gas_solar_wind/data/InputActivityRatio.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/InputActivityRatio.csv
rename to model/gas_solar_wind/data/InputActivityRatio.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/MODE_OF_OPERATION.csv b/model/gas_solar_wind/data/MODE_OF_OPERATION.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/MODE_OF_OPERATION.csv
rename to model/gas_solar_wind/data/MODE_OF_OPERATION.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/MinStorageCharge.csv b/model/gas_solar_wind/data/MinStorageCharge.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/MinStorageCharge.csv
rename to model/gas_solar_wind/data/MinStorageCharge.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/ModelPeriodEmissionLimit.csv b/model/gas_solar_wind/data/ModelPeriodEmissionLimit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/ModelPeriodEmissionLimit.csv
rename to model/gas_solar_wind/data/ModelPeriodEmissionLimit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/ModelPeriodExogenousEmission.csv b/model/gas_solar_wind/data/ModelPeriodExogenousEmission.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/ModelPeriodExogenousEmission.csv
rename to model/gas_solar_wind/data/ModelPeriodExogenousEmission.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/OperationalLife.csv b/model/gas_solar_wind/data/OperationalLife.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/OperationalLife.csv
rename to model/gas_solar_wind/data/OperationalLife.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/OperationalLifeStorage.csv b/model/gas_solar_wind/data/OperationalLifeStorage.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/OperationalLifeStorage.csv
rename to model/gas_solar_wind/data/OperationalLifeStorage.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/OutputActivityRatio.csv b/model/gas_solar_wind/data/OutputActivityRatio.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/OutputActivityRatio.csv
rename to model/gas_solar_wind/data/OutputActivityRatio.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/REGION.csv b/model/gas_solar_wind/data/REGION.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/REGION.csv
rename to model/gas_solar_wind/data/REGION.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/REMinProductionTarget.csv b/model/gas_solar_wind/data/REMinProductionTarget.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/REMinProductionTarget.csv
rename to model/gas_solar_wind/data/REMinProductionTarget.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/RETagFuel.csv b/model/gas_solar_wind/data/RETagFuel.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/RETagFuel.csv
rename to model/gas_solar_wind/data/RETagFuel.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/RETagTechnology.csv b/model/gas_solar_wind/data/RETagTechnology.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/RETagTechnology.csv
rename to model/gas_solar_wind/data/RETagTechnology.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/ReserveMargin.csv b/model/gas_solar_wind/data/ReserveMargin.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/ReserveMargin.csv
rename to model/gas_solar_wind/data/ReserveMargin.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/ReserveMarginTagFuel.csv b/model/gas_solar_wind/data/ReserveMarginTagFuel.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/ReserveMarginTagFuel.csv
rename to model/gas_solar_wind/data/ReserveMarginTagFuel.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/ReserveMarginTagTechnology.csv b/model/gas_solar_wind/data/ReserveMarginTagTechnology.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/ReserveMarginTagTechnology.csv
rename to model/gas_solar_wind/data/ReserveMarginTagTechnology.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/ResidualCapacity.csv b/model/gas_solar_wind/data/ResidualCapacity.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/ResidualCapacity.csv
rename to model/gas_solar_wind/data/ResidualCapacity.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/ResidualStorageCapacity.csv b/model/gas_solar_wind/data/ResidualStorageCapacity.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/ResidualStorageCapacity.csv
rename to model/gas_solar_wind/data/ResidualStorageCapacity.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/SEASON.csv b/model/gas_solar_wind/data/SEASON.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/SEASON.csv
rename to model/gas_solar_wind/data/SEASON.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/STORAGE.csv b/model/gas_solar_wind/data/STORAGE.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/STORAGE.csv
rename to model/gas_solar_wind/data/STORAGE.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/SpecifiedAnnualDemand.csv b/model/gas_solar_wind/data/SpecifiedAnnualDemand.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/SpecifiedAnnualDemand.csv
rename to model/gas_solar_wind/data/SpecifiedAnnualDemand.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/SpecifiedDemandProfile.csv b/model/gas_solar_wind/data/SpecifiedDemandProfile.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/SpecifiedDemandProfile.csv
rename to model/gas_solar_wind/data/SpecifiedDemandProfile.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/StorageLevelStart.csv b/model/gas_solar_wind/data/StorageLevelStart.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/StorageLevelStart.csv
rename to model/gas_solar_wind/data/StorageLevelStart.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/StorageMaxChargeRate.csv b/model/gas_solar_wind/data/StorageMaxChargeRate.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/StorageMaxChargeRate.csv
rename to model/gas_solar_wind/data/StorageMaxChargeRate.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/StorageMaxDischargeRate.csv b/model/gas_solar_wind/data/StorageMaxDischargeRate.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/StorageMaxDischargeRate.csv
rename to model/gas_solar_wind/data/StorageMaxDischargeRate.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TECHNOLOGY.csv b/model/gas_solar_wind/data/TECHNOLOGY.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TECHNOLOGY.csv
rename to model/gas_solar_wind/data/TECHNOLOGY.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TIMESLICE.csv b/model/gas_solar_wind/data/TIMESLICE.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TIMESLICE.csv
rename to model/gas_solar_wind/data/TIMESLICE.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TechnologyFromStorage.csv b/model/gas_solar_wind/data/TechnologyFromStorage.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TechnologyFromStorage.csv
rename to model/gas_solar_wind/data/TechnologyFromStorage.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TechnologyToStorage.csv b/model/gas_solar_wind/data/TechnologyToStorage.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TechnologyToStorage.csv
rename to model/gas_solar_wind/data/TechnologyToStorage.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TotalAnnualMaxCapacity.csv b/model/gas_solar_wind/data/TotalAnnualMaxCapacity.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TotalAnnualMaxCapacity.csv
rename to model/gas_solar_wind/data/TotalAnnualMaxCapacity.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TotalAnnualMaxCapacityInvestment.csv b/model/gas_solar_wind/data/TotalAnnualMaxCapacityInvestment.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TotalAnnualMaxCapacityInvestment.csv
rename to model/gas_solar_wind/data/TotalAnnualMaxCapacityInvestment.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TotalAnnualMinCapacity.csv b/model/gas_solar_wind/data/TotalAnnualMinCapacity.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TotalAnnualMinCapacity.csv
rename to model/gas_solar_wind/data/TotalAnnualMinCapacity.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TotalAnnualMinCapacityInvestment.csv b/model/gas_solar_wind/data/TotalAnnualMinCapacityInvestment.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TotalAnnualMinCapacityInvestment.csv
rename to model/gas_solar_wind/data/TotalAnnualMinCapacityInvestment.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TotalTechnologyAnnualActivityLowerLimit.csv b/model/gas_solar_wind/data/TotalTechnologyAnnualActivityLowerLimit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TotalTechnologyAnnualActivityLowerLimit.csv
rename to model/gas_solar_wind/data/TotalTechnologyAnnualActivityLowerLimit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TotalTechnologyAnnualActivityUpperLimit.csv b/model/gas_solar_wind/data/TotalTechnologyAnnualActivityUpperLimit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TotalTechnologyAnnualActivityUpperLimit.csv
rename to model/gas_solar_wind/data/TotalTechnologyAnnualActivityUpperLimit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TotalTechnologyModelPeriodActivityLowerLimit.csv b/model/gas_solar_wind/data/TotalTechnologyModelPeriodActivityLowerLimit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TotalTechnologyModelPeriodActivityLowerLimit.csv
rename to model/gas_solar_wind/data/TotalTechnologyModelPeriodActivityLowerLimit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TotalTechnologyModelPeriodActivityUpperLimit.csv b/model/gas_solar_wind/data/TotalTechnologyModelPeriodActivityUpperLimit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TotalTechnologyModelPeriodActivityUpperLimit.csv
rename to model/gas_solar_wind/data/TotalTechnologyModelPeriodActivityUpperLimit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TradeRoute.csv b/model/gas_solar_wind/data/TradeRoute.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/TradeRoute.csv
rename to model/gas_solar_wind/data/TradeRoute.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/VariableCost.csv b/model/gas_solar_wind/data/VariableCost.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/VariableCost.csv
rename to model/gas_solar_wind/data/VariableCost.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/YEAR.csv b/model/gas_solar_wind/data/YEAR.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/YEAR.csv
rename to model/gas_solar_wind/data/YEAR.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/YearSplit.csv b/model/gas_solar_wind/data/YearSplit.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/YearSplit.csv
rename to model/gas_solar_wind/data/YearSplit.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/default_values.csv b/model/gas_solar_wind/data/default_values.csv
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/data/default_values.csv
rename to model/gas_solar_wind/data/default_values.csv
diff --git a/SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/datapackage.json b/model/gas_solar_wind/datapackage.json
similarity index 100%
rename from SimpleEnergyModel/SimpleEnergyModel_GasSolarWind/datapackage.json
rename to model/gas_solar_wind/datapackage.json