diff --git a/MANIFEST.in b/MANIFEST.in
index 78b3b6f8..a5793331 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1 @@
-include src/original/PvH_NKI_NL/AIF/PopulationAIF_GeorgiouMRM2018.txt
\ No newline at end of file
+include from src.original/PvH_NKI_NL/AIF/PopulationAIF_GeorgiouMRM2018.txt
\ No newline at end of file
diff --git a/doc/code_contributions_record.csv b/doc/code_contributions_record.csv
index 821978e4..90c047c5 100644
--- a/doc/code_contributions_record.csv
+++ b/doc/code_contributions_record.csv
@@ -1,88 +1,88 @@
 Technique,Category,Subcategory (link to source code),Notes,Subfolder,Authors,Institution,function/module name,doi,Tester,Test status (empty/in-progress/complete)
-DCE,Bolus arrival time,[piecewise linear quadratic function](../src/original/LEK_UoEdinburgh_UK/PharmacokineticModelling/BAT_estimation.py),Cheong et al (DOI: 10.1088/0031-9155/48/5/403),LEK_UoEdinburgh,Lucy Kershaw,"University of Edinburgh, UK",BAT_linquad,,tbd,
-DCE,Bolus arrival time,[fitting Kety (Tofts) model to first third of the curve](../src/original/LEK_UoEdinburgh_UK/PharmacokineticModelling/BAT_estimation.py),,LEK_UoEdinburgh,Lucy Kershaw,"University of Edinburgh, UK",BAT_kety,,tbd,
-DCE,Input Functions,[load AIF](../src/original/MB_QBI_UoManchester_UK/QbiPy/dce_models/dce_aif.py),load from txt,MB_QBI_UoManchester_UK,Michael Berks,"University of Manchester, UK",read_AIF,https://doi.org/10.21105/joss.03523,tbd,
-DCE,Input Functions,[Parker AIF](../src/original/MB_QBI_UoManchester_UK/QbiPy/dce_models/dce_aif.py),,MB_QBI_UoManchester_UK,Michael Berks,"University of Manchester, UK",compute_population_AIF,https://doi.org/10.21105/joss.03523,JK/PvH,completed
-DCE,Input Functions,[patient-specific AIF](../src/original/MJT_UoEdinburgh_UK/aifs.py),constructed from time-concentration data,MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK",patientSpecific,,tbd,
-DCE,Input Functions,[Parker AIF](../src/original/MJT_UoEdinburgh_UK/aifs.py),"Parker AIF, Parker-like AIF",MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK",Parker,,JK/PvH,completed
-DCE,Input Functions,[Manning AIF](../src/original/MJT_UoEdinburgh_UK/aifs.py),Manning et al (https://doi.org/10.1002/mrm.28833),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","ManningFast, ManningSlow",,tbd,completed
-DCE,Input Functions,[Heye AIF](../src/original/MJT_UoEdinburgh_UK/aifs.py),Heye et al (https://doi.org/10.1016/j.neuroimage.2015.10.018),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK",Heye,,tbd,completed
-DCE,Input Functions,[AIF parameterization](../src/original/OG_MO_AUMC_ICR_RMH_NL_UK/ExtendedTofts/DCE.py),,OG_MO_AUMC_ICR_RMH,"Oliver Gurney-Champion, Matthew Orton","Amsterdam University Medical Center, the Netherlands, Institute of Cancer Research, UK","Cosine4AIF, Cosine8AIF",https://doi.org/10.1088/0031-9155/53/5/005; https://doi.org/10.1007/s00330-015-4012-9,tbd,
-DCE,Input Functions,[Head-and-neck population AIF](../src/original/OG_MO_AUMC_ICR_RMH_NL_UK/ExtendedTofts/DCE.py),Wong et al (DOI: https://doi.org/10.2967/jnumed.116.174433),OG_MO_AUMC_ICR_RMH,"Oliver Gurney-Champion, Matthew Orton","Amsterdam University Medical Center, the Netherlands, Institute of Cancer Research, UK",aifPopHN,,tbd,
-DCE,Input Functions,[Parker AIF](../src/original/OG_MO_AUMC_ICR_RMH_NL_UK/ExtendedTofts/DCE.py),,OG_MO_AUMC_ICR_RMH,"Oliver Gurney-Champion, Matthew Orton","Amsterdam University Medical Center, the Netherlands, Institute of Cancer Research, UK",aifPopPMB,,tbd,
-DCE,Input Functions,[load AIF](../src/original/OGJ_OsloU_NOR/MRImageAnalysis/DCE/ArterialInputFunction.py),from txt,OGJ_OsloU_NOR,Ole Gunnar Johansen,"University of Oslo, Norway",loadStandard,,tbd,
-DCE,Input Functions,[AIF parameterization](../src/original/OGJ_OsloU_NOR/MRImageAnalysis/DCE/ArterialInputFunction.py),fit gamma-variate function,OGJ_OsloU_NOR,Ole Gunnar Johansen,"University of Oslo, Norway",gammaVariateFit,,tbd,
-DCE,Input Functions,[Georgiou AIF](../src/original/PvH_NKI_NL/AIF/PopulationAIF.py),Georgiou et al (DOI: 10.1002/mrm.27524),PvH_NKI,Petra van Houdt,"the Netherlands Cancer Institute, the Netherlands",GeorgiouAIF,,JK/PvH,completed
-DCE,Input Functions,[Parker AIF](../src/original/PvH_NKI_NL/AIF/PopulationAIF.py),,PvH_NKI,Petra van Houdt,"the Netherlands Cancer Institute, the Netherlands",ParkerAIF,,JK/PvH,completed
-DCE,Input Functions,[Parker AIF](../src/original/ST_USyd_AUS/InputFunctions.py),,ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia","AIF, variableAIF",,JK/PvH,completed
-DCE,Input Functions,[preclinical AIF](../src/original/ST_USyd_AUS/InputFunctions.py),McGrath et al (DOI: 10.1002/mrm.21959),ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia",preclinicalAIF,,JK/PvH,completed
-DCE,Miscellaneous,[enhancement detection](../src/original/OG_MO_AUMC_ICR_RMH_NL_UK/ExtendedTofts/DCE.py),check for enhancement,OG_MO_AUMC_ICR_RMH,"Oliver Gurney-Champion, Matthew Orton","Amsterdam University Medical Center, the Netherlands, Institute of Cancer Research, UK",enhance,,tbd,
-DCE,Parameter derivation,[iAUC](../src/original/MB_QBI_UoManchester_UK/QbiPy/dce_models/tissue_concentration.py),,MB_QBI_UoManchester_UK,Michael Berks,"University of Manchester, UK",compute_IAUC,https://doi.org/10.21105/joss.03523,tbd,
-DCE,Pharmacokinetic models,[Tofts](../src/original/DS_BW_VanderBiltUMC_USA/dcemri.py),NLLS fitting (+forward model),DS_BW_VanderBiltUMC_USA,"David Smith, Brian Welch","VanderBilt University Medical Center, USA","tofts_integral, fit_tofts_model",,tdd,
-DCE,Pharmacokinetic models,[extended Tofts](../src/original/DS_BW_VanderBiltUMC_USA/dcemri.py),NLLS fitting (+forward model),DS_BW_VanderBiltUMC_USA,"David Smith, Brian Welch","VanderBilt University Medical Center, USA","ext_tofts_integral, fit_tofts_model",,tbd,
-DCE,Pharmacokinetic models,[Tofts](../src/original/LCB_BNI_USA/dce.py),NLLS fitting (+ forward model),LCB_BNI_USA,Laura Bell,"Barrow Neurological Institute, USA","tofts_model, fit_tofts",,ST/OGC,completed
-DCE,Pharmacokinetic models,[2-cmp exchange](../src/original/LEK_UoEdinburgh_UK/PharmacokineticModelling/models.py),forward model,LEK_UoEdinburgh,Lucy Kershaw,"University of Edinburgh, UK",TwoCXM,,MJT,completed
-DCE,Pharmacokinetic models,[2-cmp uptake](../src/original/LEK_UoEdinburgh_UK/PharmacokineticModelling/models.py),forward model,LEK_UoEdinburgh,Lucy Kershaw,"University of Edinburgh, UK",TwoCUM,,MJT,completed
-DCE,Pharmacokinetic models,[AATH](../src/original/LEK_UoEdinburgh_UK/PharmacokineticModelling/models.py),forward model,LEK_UoEdinburgh,Lucy Kershaw,"University of Edinburgh, UK",AATH,,tbd,
-DCE,Pharmacokinetic models,[extended Tofts](../src/original/LEK_UoEdinburgh_UK/PharmacokineticModelling/models.py),forward model,LEK_UoEdinburgh,Lucy Kershaw,"University of Edinburgh, UK",ExtKety,,ST/OGC,completed
-DCE,Pharmacokinetic models,[Patlak](../src/original/LEK_UoEdinburgh_UK/PharmacokineticModelling/models.py),forward model,LEK_UoEdinburgh,Lucy Kershaw,"University of Edinburgh, UK",Patlak,,MJT,completed
-DCE,Pharmacokinetic models,[Tofts](../src/original/LEK_UoEdinburgh_UK/PharmacokineticModelling/models.py),forward model,LEK_UoEdinburgh,Lucy Kershaw,"University of Edinburgh, UK",Kety,,ST/OGC,completed
-DCE,Pharmacokinetic models,[2-cmp exchange](../src/original/MB_QBI_UoManchester_UK/QbiPy/dce_models/two_cxm_model.py),LLSQ fitting (+forward model),MB_QBI_UoManchester_UK,Michael Berks,"University of Manchester, UK",two_cxm_model,https://doi.org/10.21105/joss.03523,MJT,completed
-DCE,Pharmacokinetic models,[2-cmp filtration](../src/original/MB_QBI_UoManchester_UK/QbiPy/dce_models/two_cfm_model.py),LLSQ fitting (+forward model),MB_QBI_UoManchester_UK,Michael Berks,"University of Manchester, UK",two_cfm_model,https://doi.org/10.21105/joss.03523,tbd,
-DCE,Pharmacokinetic models,[active uptake and efflux (AUEM)](../src/original/MB_QBI_UoManchester_UK/QbiPy/dce_models/active_uptake_model.py),LLSQ fitting (+forward model),MB_QBI_UoManchester_UK,Michael Berks,"University of Manchester, UK",active_uptake_model,https://doi.org/10.21105/joss.03523,tbd,
-DCE,Pharmacokinetic models,[dual-inlet general model](../src/original/MB_QBI_UoManchester_UK/QbiPy/dce_models/dibem.py),LLSQ fitting (+forward model),MB_QBI_UoManchester_UK,Michael Berks,"University of Manchester, UK",dibem,https://doi.org/10.21105/joss.03523,tbd,
-DCE,Pharmacokinetic models,[extended Tofts](../src/original/MB_QBI_UoManchester_UK/QbiPy/dce_models/tofts_model.py),LLSQ fitting (+forward model),MB_QBI_UoManchester_UK,Michael Berks,"University of Manchester, UK",tofts_model,https://doi.org/10.21105/joss.03523,ST/OGC,completed
-DCE,Pharmacokinetic models,[2-cmp exchange](../src/original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to concentration values (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","TCXM, EnhToPKP, ConcToPKP",,MJT,completed
-DCE,Pharmacokinetic models,[2-cmp exchange](../src/original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to signal incl. water exchange (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","TCXM, EnhToPKP, ConcToPKP",,MJT,completed
-DCE,Pharmacokinetic models,[2-cmp uptake](../src/original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to concentration values (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","TCUM, EnhToPKP, ConcToPKP",,MJT,completed
-DCE,Pharmacokinetic models,[2-cmp uptake](../src/original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to signal incl. water exchange (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","TCUM, EnhToPKP, ConcToPKP",,MJT,completed
-DCE,Pharmacokinetic models,[extended Tofts](../src/original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to concentration values (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","ExtendedTofts, EnhToPKP, ConcToPKP",,ST/OGC,completed
-DCE,Pharmacokinetic models,[extended Tofts](../src/original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to signal incl. water exchange (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","ExtendedTofts, EnhToPKP, ConcToPKP",,ST/OGC,completed
-DCE,Pharmacokinetic models,[Patlak](../src/original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to concentration values (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","Patlak, EnhToPKP, ConcToPKP",,MJT,completed
-DCE,Pharmacokinetic models,[Patlak](../src/original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to signal incl. water exchange (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","Patlak, EnhToPKP, ConcToPKP",,MJT,completed
-DCE,Pharmacokinetic models,[Patlak](../src/original/MJT_UoEdinburgh_UK/dce_fit.py),LLSQ fitting,MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK",PatlakLinear,,MJT,completed
-DCE,Pharmacokinetic models,[steady-state vp](../src/original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to concentration values (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","SteadyStateVp, EnhToPKP, ConcToPKP",,tbd,
-DCE,Pharmacokinetic models,[steady-state vp](../src/original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to signal incl. water exchange (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","SteadyStateVp, EnhToPKP, ConcToPKP",,tbd,
-DCE,Pharmacokinetic models,[Tofts](../src/original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to concentration values (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","Tofts, EnhToPKP, ConcToPKP",,ST/OGC,completed
-DCE,Pharmacokinetic models,[Tofts](../src/original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to signal incl. water exchange (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","Tofts,EnhToPKP, ConcToPKP",,ST/OGC,completed
-DCE,Pharmacokinetic models,[extended Tofts](../src/original/OG_MO_AUMC_ICR_RMH_NL_UK/ExtendedTofts/DCE.py),NLLS fitting (+forward model),OG_MO_AUMC_ICR_RMH,"Oliver Gurney-Champion, Matthew Orton","Amsterdam University Medical Center, the Netherlands, Institute of Cancer Research, UK",fit_tofts_model,,ST/OGC,completed
-DCE,Pharmacokinetic models,[2-cmp exchange](../src/original/OGJ_OsloU_NOR/MRImageAnalysis/DCE/Analyze.py),LLSQ fitting (+ forward model),OGJ_OsloU_NOR,Ole Gunnar Johansen,"University of Oslo, Norway","twoCXM, fitToModelLLSQ",,MJT,completed
-DCE,Pharmacokinetic models,[extended Tofts](../src/original/OGJ_OsloU_NOR/MRImageAnalysis/DCE/Analyze.py),NLLS fitting (+ forward model),OGJ_OsloU_NOR,Ole Gunnar Johansen,"University of Oslo, Norway","ETM,  fitToModelNLLS, fitToModelNLLS_parallel",,ST/OGC,completed
-DCE,Pharmacokinetic models,[extended Tofts](../src/original/OGJ_OsloU_NOR/MRImageAnalysis/DCE/Analyze.py),LLSQ fitting (+ forward model),OGJ_OsloU_NOR,Ole Gunnar Johansen,"University of Oslo, Norway","ETM, fitToModelLLSQ",,ST/OGC,completed
-DCE,Pharmacokinetic models,[Tofts](../src/original/OGJ_OsloU_NOR/MRImageAnalysis/DCE/Analyze.py),NLLS fitting (+ forward model),OGJ_OsloU_NOR,Ole Gunnar Johansen,"University of Oslo, Norway","TM,  fitToModelNLLS, fitToModelNLLS_parallel",,ST/OGC,completed
-DCE,Pharmacokinetic models,[Tofts](../src/original/OGJ_OsloU_NOR/MRImageAnalysis/DCE/Analyze.py),LLSQ fitting (+ forward model),OGJ_OsloU_NOR,Ole Gunnar Johansen,"University of Oslo, NOR","TM, fitToModelLLSQ",,ST/OGC,completed
-DCE,Pharmacokinetic models,[1-cmp](../src/original/ST_USyd_AUS/ModelDictionary.py),forward model,ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia",OneCompartment,,tbd,
-DCE,Pharmacokinetic models,[dual-inlet 1-cmp](../src/original/ST_USyd_AUS/ModelDictionary.py),forward model,ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia",DualInletOneCompartment,,tbd,
-DCE,Pharmacokinetic models,[dual-inlet ext Tofts](../src/original/ST_USyd_AUS/ModelDictionary.py),forward model,ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia",DualInletExtendedTofts,,tbd,
-DCE,Pharmacokinetic models,[dual-inlet high-flow 2-cmp Gadoxetate](../src/original/ST_USyd_AUS/ModelDictionary.py),forward model,ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia",DualInletconc_HF2CGM,,tbd,
-DCE,Pharmacokinetic models,[extended Tofts](../src/original/ST_USyd_AUS/ModelDictionary.py),forward model,ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia",ExtendedTofts,,ST/OGC,completed
-DCE,Pharmacokinetic models,[Tofts](../src/original/ST_USyd_AUS/ModelDictionary.py),forward model,ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia",Tofts,,ST/OGC,completed
-DCE,Pharmacokinetic models,[high flow 2-cmp Gadoxetate](../src/original/ST_USyd_AUS/ModelDictionary.py),forward model,ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia",,,tbd,
-DCE,Pharmacokinetic models,[Patlak](../src/original/ST_USyd_AUS/ModelDictionary.py),forward model,ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia",PatlakModel,,MJT,completed
-DCE,Signal to Concentration,[SPGR](../src/original/DS_BW_VanderBiltUMC_USA/dcemri.py),"two-steps: S->R1, R1->C",DS_BW_VanderBiltUMC_USA,"David Smith, Brian Welch","VanderBilt University Medical Center, USA","r1eff_to_conc, dce_to_r1eff",,tbd,
-DCE,Signal to Concentration,[SPGR or GE-EPI](../src/original/LCB_BNI_USA/dce.py),,LCB_BNI_USA,Laura Bell,"Barrow Neurological Institute, USA","signal_to_conc, estimate_delta_R1",,LK,completed
-DCE,Signal to concentration,[SPGR](../src/original/LEK_UoEdinburgh_UK/SignalToConcentration/SI2Conc.py),"reverse C->S also available",LEK_UoEdinburgh,Lucy Kershaw,"University of Edinburgh, UK",SI2Conc,,LK,completed
-DCE,Signal to concentration,[SPGR](../src/original/MB_QBI_UoManchester_UK/QbiPy/dce_models/tissue_concentration.py),"reverse C->S also available",MB_QBI_UoManchester_UK,Michael Berks,"University of Manchester, UK",signal_to_concentration,https://doi.org/10.21105/joss.03523,LK,completed
-DCE,Signal to concentration,[SPGR](../src/original/MJT_UoEdinburgh_UK/dce_fit.py),"two steps: S-> enhancement, enhancement -> C; reverse C->S also available",MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","sign_to_enh, enh_to_conc",,LK,completed
-DCE,Signal to concentration,[SPGR](../src/original/OG_MO_AUMC_ICR_RMH_NL_UK/ExtendedTofts/DCE.py),"two steps: S->R1, R1 -> C; reverse C->S also available",OG_MO_AUMC_ICR_RMH,"Oliver Gurney-Champion, Matthew Orton","Amsterdam University Medical Center, the Netherlands, Institute of Cancer Research, UK","dce_to_r1eff, r1eff_to_conc",,LK,completed
-DCE,Signal to concentration,[SPGR](../src/original/ST_USyd_AUS/signals2conc.py),"reverse R1->C also available",ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia",signals2conc,,LK,completed
-DCE,T1,[VFA](../src/original/DS_BW_VanderBiltUMC_USA/dcemri.py),nonlinear,DS_BW_VanderBiltUMC_USA,"David Smith, Brian Welch","VanderBilt University Medical Center, USA",fit_R1,,tbd,
-DCE,T1,[VFA](../src/original/ZA_McGill_CAN/vfa.py),despot,McGill_VFA,Zaki Ahmed,"McGill University, Canada",despot,,MJT,completed
-DCE,T1,[VFA](../src/original/ZA_McGill_CAN/vfa.py),novifast,McGill_VFA,Zaki Ahmed,"McGill University, Canada",novifast,,MJT,completed
-DCE,T1,[DESPOT1-HIFI](../src/original/MJT_UoEdinburgh_UK/t1_fit.py),Fit any combination of (IR-)SPGR scans to estimate T1,MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK",HIFI,,MJT,in-progress
-DCE,T1,[VFA](../src/original/MJT_UoEdinburgh_UK/t1_fit.py),linear,MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK",VFALinear,,MJT,complete
-DCE,T1,[VFA](../src/original/MJT_UoEdinburgh_UK/t1_fit.py),nonlinear,MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK",VFANonlinear,,MJT,complete
-DCE,T1,[VFA](../src/original/MJT_UoEdinburgh_UK/t1_fit.py),two flip angles,MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK",VFA2Points,,tbd,
-DCE,T1,[VFA](../src/original/OG_MO_AUMC_ICR_RMH_NL_UK/ExtendedTofts/DCE.py),two flip angles (linear),OG_MO_AUMC_ICR_RMH,"Oliver Gurney-Champion, Matthew Orton","Amsterdam University Medical Center, the Netherlands, Institute of Cancer Research, UK",R1_two_fas,,MJT,competed
-DCE,T1,[VFA](../src/original/OG_MO_AUMC_ICR_RMH_NL_UK/ExtendedTofts/DCE.py),nonlinear,OG_MO_AUMC_ICR_RMH,"Oliver Gurney-Champion, Matthew Orton","Amsterdam University Medical Center, the Netherlands, Institute of Cancer Research, UK",R1_VFA,,MJT,competed
-DCE,T1,[VFA](../src/original/ST_USyd_AUS/VFAT1mapping.py),linear,ST_Sydney_AUS_T1,Sirisha Tadimalla,"University of Sydney, Australia",VFAT1mapping,,MJT,completed
-DCE,T1,[VFA](../src/original/ST_USyd_AUS/VFAT1mapping.py),nonlinear,ST_Sydney_AUS_T1,Sirisha Tadimalla,"University of Sydney, Australia",VFAT1mapping,,MJT,completed
-DCE/DSC,AIF deconvolution,[Volterra discretization with L-curve criterion](../src/original/SR_TBG_BNIPhoenix_USA/AIFDeconvolution/AIF_deconvolution.py),,SR_TBG_BNI_PhoenixUSA,"Sudarshan Ragunathan, Laura Bell","Barrow Neurological Institute, USA",AIFdeconvolution,,JA,completed
-DCE/DSC,Miscellaneous,[calculate SNR](../src/original/DS_BW_VanderBiltUMC_USA/dcemri.py),,DS_BW_VanderBiltUMC_USA,"David Smith, Brian Welch","VanderBilt University Medical Center, USA",signal_to_noise_ratio,,tbd,
-DCE/DSC,Miscellaneous,[calculate enhancement ratio](../src/original/DS_BW_VanderBiltUMC_USA/dcemri.py),,DS_BW_VanderBiltUMC_USA,"David Smith, Brian Welch","VanderBilt University Medical Center, USA",signal_enhancement_ratio,,tbd,
-DSC,Input Functions,[automatic AIF selection](../src/original/JBJA_GUSahlgrenska_SWE/AIF_selection_auto/AIF_selection_automatic.py),"fully automatic, semi-automatic",JBJA_GUSahlgrenskaSWE,"Jesper Browall, Jonathan Arvidsson","Sahlgrenska University Hospital and Gothenburg University, Gothenburg, Sweden",AIF_selection_automatic.py,DOI: 10.1002/mrm.20759,tbd,
-DSC,Leakage correction,[BSW](../src/original/SR_TBG_BNIPhoenix_USA/LeakageCorrection/bsw_leakagecorr.py),,SR_TBG_BNI_PhoenixUSA,"Sudarshan Ragunathan, Laura Bell","Barrow Neurological Institute, USA",BSWleakagecorr,,SR,in-progress
-DSC,Parameter derivation,"[CBV,CBF,MTT](../src/original/SR_TBG_BNIPhoenix_USA/DSCparameters/DSC_parameters.py)",,SR_TBG_BNI_PhoenixUSA,"Sudarshan Ragunathan, Laura Bell","Barrow Neurological Institute, USA",DSCparameters,,tbd,
-DSC,Signal to deltaR2*,[single echo](../src/original/LCB_BNI_USA/dsc.py),,LCB_BNI_USA,Laura Bell,"Barrow Neurological Institute, USA",,estimate_delta_R2s,tbd,
-DSC,Signal to deltaR2*,[dual echo](../src/original/LCB_BNI_USA/dsc.py),,LCB_BNI_USA,Laura Bell,"Barrow Neurological Institute, USA",,"estimate_delta_R2s, estimate_delta_R2s_dual_echo",tbd,
-DSC,Signal to R2*,[dual echo](../src/original/LCB_BNI_USA/dsc.py),,LCB_BNI_USA,Laura Bell,"Barrow Neurological Institute, USA",,estimate_R2s,tbd,
\ No newline at end of file
+DCE,Bolus arrival time,[piecewise linear quadratic function](../from src.original/LEK_UoEdinburgh_UK/PharmacokineticModelling/BAT_estimation.py),Cheong et al (DOI: 10.1088/0031-9155/48/5/403),LEK_UoEdinburgh,Lucy Kershaw,"University of Edinburgh, UK",BAT_linquad,,tbd,
+DCE,Bolus arrival time,[fitting Kety (Tofts) model to first third of the curve](../from src.original/LEK_UoEdinburgh_UK/PharmacokineticModelling/BAT_estimation.py),,LEK_UoEdinburgh,Lucy Kershaw,"University of Edinburgh, UK",BAT_kety,,tbd,
+DCE,Input Functions,[load AIF](../from src.original/MB_QBI_UoManchester_UK/QbiPy/dce_models/dce_aif.py),load from txt,MB_QBI_UoManchester_UK,Michael Berks,"University of Manchester, UK",read_AIF,https://doi.org/10.21105/joss.03523,tbd,
+DCE,Input Functions,[Parker AIF](../from src.original/MB_QBI_UoManchester_UK/QbiPy/dce_models/dce_aif.py),,MB_QBI_UoManchester_UK,Michael Berks,"University of Manchester, UK",compute_population_AIF,https://doi.org/10.21105/joss.03523,JK/PvH,completed
+DCE,Input Functions,[patient-specific AIF](../from src.original/MJT_UoEdinburgh_UK/aifs.py),constructed from time-concentration data,MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK",patientSpecific,,tbd,
+DCE,Input Functions,[Parker AIF](../from src.original/MJT_UoEdinburgh_UK/aifs.py),"Parker AIF, Parker-like AIF",MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK",Parker,,JK/PvH,completed
+DCE,Input Functions,[Manning AIF](../from src.original/MJT_UoEdinburgh_UK/aifs.py),Manning et al (https://doi.org/10.1002/mrm.28833),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","ManningFast, ManningSlow",,tbd,completed
+DCE,Input Functions,[Heye AIF](../from src.original/MJT_UoEdinburgh_UK/aifs.py),Heye et al (https://doi.org/10.1016/j.neuroimage.2015.10.018),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK",Heye,,tbd,completed
+DCE,Input Functions,[AIF parameterization](../from src.original/OG_MO_AUMC_ICR_RMH_NL_UK/ExtendedTofts/DCE.py),,OG_MO_AUMC_ICR_RMH,"Oliver Gurney-Champion, Matthew Orton","Amsterdam University Medical Center, the Netherlands, Institute of Cancer Research, UK","Cosine4AIF, Cosine8AIF",https://doi.org/10.1088/0031-9155/53/5/005; https://doi.org/10.1007/s00330-015-4012-9,tbd,
+DCE,Input Functions,[Head-and-neck population AIF](../from src.original/OG_MO_AUMC_ICR_RMH_NL_UK/ExtendedTofts/DCE.py),Wong et al (DOI: https://doi.org/10.2967/jnumed.116.174433),OG_MO_AUMC_ICR_RMH,"Oliver Gurney-Champion, Matthew Orton","Amsterdam University Medical Center, the Netherlands, Institute of Cancer Research, UK",aifPopHN,,tbd,
+DCE,Input Functions,[Parker AIF](../from src.original/OG_MO_AUMC_ICR_RMH_NL_UK/ExtendedTofts/DCE.py),,OG_MO_AUMC_ICR_RMH,"Oliver Gurney-Champion, Matthew Orton","Amsterdam University Medical Center, the Netherlands, Institute of Cancer Research, UK",aifPopPMB,,tbd,
+DCE,Input Functions,[load AIF](../from src.original/OGJ_OsloU_NOR/MRImageAnalysis/DCE/ArterialInputFunction.py),from txt,OGJ_OsloU_NOR,Ole Gunnar Johansen,"University of Oslo, Norway",loadStandard,,tbd,
+DCE,Input Functions,[AIF parameterization](../from src.original/OGJ_OsloU_NOR/MRImageAnalysis/DCE/ArterialInputFunction.py),fit gamma-variate function,OGJ_OsloU_NOR,Ole Gunnar Johansen,"University of Oslo, Norway",gammaVariateFit,,tbd,
+DCE,Input Functions,[Georgiou AIF](../from src.original/PvH_NKI_NL/AIF/PopulationAIF.py),Georgiou et al (DOI: 10.1002/mrm.27524),PvH_NKI,Petra van Houdt,"the Netherlands Cancer Institute, the Netherlands",GeorgiouAIF,,JK/PvH,completed
+DCE,Input Functions,[Parker AIF](../from src.original/PvH_NKI_NL/AIF/PopulationAIF.py),,PvH_NKI,Petra van Houdt,"the Netherlands Cancer Institute, the Netherlands",ParkerAIF,,JK/PvH,completed
+DCE,Input Functions,[Parker AIF](../from src.original/ST_USyd_AUS/InputFunctions.py),,ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia","AIF, variableAIF",,JK/PvH,completed
+DCE,Input Functions,[preclinical AIF](../from src.original/ST_USyd_AUS/InputFunctions.py),McGrath et al (DOI: 10.1002/mrm.21959),ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia",preclinicalAIF,,JK/PvH,completed
+DCE,Miscellaneous,[enhancement detection](../from src.original/OG_MO_AUMC_ICR_RMH_NL_UK/ExtendedTofts/DCE.py),check for enhancement,OG_MO_AUMC_ICR_RMH,"Oliver Gurney-Champion, Matthew Orton","Amsterdam University Medical Center, the Netherlands, Institute of Cancer Research, UK",enhance,,tbd,
+DCE,Parameter derivation,[iAUC](../from src.original/MB_QBI_UoManchester_UK/QbiPy/dce_models/tissue_concentration.py),,MB_QBI_UoManchester_UK,Michael Berks,"University of Manchester, UK",compute_IAUC,https://doi.org/10.21105/joss.03523,tbd,
+DCE,Pharmacokinetic models,[Tofts](../from src.original/DS_BW_VanderBiltUMC_USA/dcemri.py),NLLS fitting (+forward model),DS_BW_VanderBiltUMC_USA,"David Smith, Brian Welch","VanderBilt University Medical Center, USA","tofts_integral, fit_tofts_model",,tdd,
+DCE,Pharmacokinetic models,[extended Tofts](../from src.original/DS_BW_VanderBiltUMC_USA/dcemri.py),NLLS fitting (+forward model),DS_BW_VanderBiltUMC_USA,"David Smith, Brian Welch","VanderBilt University Medical Center, USA","ext_tofts_integral, fit_tofts_model",,tbd,
+DCE,Pharmacokinetic models,[Tofts](../from src.original/LCB_BNI_USA/dce.py),NLLS fitting (+ forward model),LCB_BNI_USA,Laura Bell,"Barrow Neurological Institute, USA","tofts_model, fit_tofts",,ST/OGC,completed
+DCE,Pharmacokinetic models,[2-cmp exchange](../from src.original/LEK_UoEdinburgh_UK/PharmacokineticModelling/models.py),forward model,LEK_UoEdinburgh,Lucy Kershaw,"University of Edinburgh, UK",TwoCXM,,MJT,completed
+DCE,Pharmacokinetic models,[2-cmp uptake](../from src.original/LEK_UoEdinburgh_UK/PharmacokineticModelling/models.py),forward model,LEK_UoEdinburgh,Lucy Kershaw,"University of Edinburgh, UK",TwoCUM,,MJT,completed
+DCE,Pharmacokinetic models,[AATH](../from src.original/LEK_UoEdinburgh_UK/PharmacokineticModelling/models.py),forward model,LEK_UoEdinburgh,Lucy Kershaw,"University of Edinburgh, UK",AATH,,tbd,
+DCE,Pharmacokinetic models,[extended Tofts](../from src.original/LEK_UoEdinburgh_UK/PharmacokineticModelling/models.py),forward model,LEK_UoEdinburgh,Lucy Kershaw,"University of Edinburgh, UK",ExtKety,,ST/OGC,completed
+DCE,Pharmacokinetic models,[Patlak](../from src.original/LEK_UoEdinburgh_UK/PharmacokineticModelling/models.py),forward model,LEK_UoEdinburgh,Lucy Kershaw,"University of Edinburgh, UK",Patlak,,MJT,completed
+DCE,Pharmacokinetic models,[Tofts](../from src.original/LEK_UoEdinburgh_UK/PharmacokineticModelling/models.py),forward model,LEK_UoEdinburgh,Lucy Kershaw,"University of Edinburgh, UK",Kety,,ST/OGC,completed
+DCE,Pharmacokinetic models,[2-cmp exchange](../from src.original/MB_QBI_UoManchester_UK/QbiPy/dce_models/two_cxm_model.py),LLSQ fitting (+forward model),MB_QBI_UoManchester_UK,Michael Berks,"University of Manchester, UK",two_cxm_model,https://doi.org/10.21105/joss.03523,MJT,completed
+DCE,Pharmacokinetic models,[2-cmp filtration](../from src.original/MB_QBI_UoManchester_UK/QbiPy/dce_models/two_cfm_model.py),LLSQ fitting (+forward model),MB_QBI_UoManchester_UK,Michael Berks,"University of Manchester, UK",two_cfm_model,https://doi.org/10.21105/joss.03523,tbd,
+DCE,Pharmacokinetic models,[active uptake and efflux (AUEM)](../from src.original/MB_QBI_UoManchester_UK/QbiPy/dce_models/active_uptake_model.py),LLSQ fitting (+forward model),MB_QBI_UoManchester_UK,Michael Berks,"University of Manchester, UK",active_uptake_model,https://doi.org/10.21105/joss.03523,tbd,
+DCE,Pharmacokinetic models,[dual-inlet general model](../from src.original/MB_QBI_UoManchester_UK/QbiPy/dce_models/dibem.py),LLSQ fitting (+forward model),MB_QBI_UoManchester_UK,Michael Berks,"University of Manchester, UK",dibem,https://doi.org/10.21105/joss.03523,tbd,
+DCE,Pharmacokinetic models,[extended Tofts](../from src.original/MB_QBI_UoManchester_UK/QbiPy/dce_models/tofts_model.py),LLSQ fitting (+forward model),MB_QBI_UoManchester_UK,Michael Berks,"University of Manchester, UK",tofts_model,https://doi.org/10.21105/joss.03523,ST/OGC,completed
+DCE,Pharmacokinetic models,[2-cmp exchange](../from src.original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to concentration values (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","TCXM, EnhToPKP, ConcToPKP",,MJT,completed
+DCE,Pharmacokinetic models,[2-cmp exchange](../from src.original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to signal incl. water exchange (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","TCXM, EnhToPKP, ConcToPKP",,MJT,completed
+DCE,Pharmacokinetic models,[2-cmp uptake](../from src.original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to concentration values (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","TCUM, EnhToPKP, ConcToPKP",,MJT,completed
+DCE,Pharmacokinetic models,[2-cmp uptake](../from src.original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to signal incl. water exchange (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","TCUM, EnhToPKP, ConcToPKP",,MJT,completed
+DCE,Pharmacokinetic models,[extended Tofts](../from src.original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to concentration values (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","ExtendedTofts, EnhToPKP, ConcToPKP",,ST/OGC,completed
+DCE,Pharmacokinetic models,[extended Tofts](../from src.original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to signal incl. water exchange (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","ExtendedTofts, EnhToPKP, ConcToPKP",,ST/OGC,completed
+DCE,Pharmacokinetic models,[Patlak](../from src.original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to concentration values (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","Patlak, EnhToPKP, ConcToPKP",,MJT,completed
+DCE,Pharmacokinetic models,[Patlak](../from src.original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to signal incl. water exchange (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","Patlak, EnhToPKP, ConcToPKP",,MJT,completed
+DCE,Pharmacokinetic models,[Patlak](../from src.original/MJT_UoEdinburgh_UK/dce_fit.py),LLSQ fitting,MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK",PatlakLinear,,MJT,completed
+DCE,Pharmacokinetic models,[steady-state vp](../from src.original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to concentration values (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","SteadyStateVp, EnhToPKP, ConcToPKP",,tbd,
+DCE,Pharmacokinetic models,[steady-state vp](../from src.original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to signal incl. water exchange (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","SteadyStateVp, EnhToPKP, ConcToPKP",,tbd,
+DCE,Pharmacokinetic models,[Tofts](../from src.original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to concentration values (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","Tofts, EnhToPKP, ConcToPKP",,ST/OGC,completed
+DCE,Pharmacokinetic models,[Tofts](../from src.original/MJT_UoEdinburgh_UK/dce_fit.py),NLLS fitting to signal incl. water exchange (incl forward model),MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","Tofts,EnhToPKP, ConcToPKP",,ST/OGC,completed
+DCE,Pharmacokinetic models,[extended Tofts](../from src.original/OG_MO_AUMC_ICR_RMH_NL_UK/ExtendedTofts/DCE.py),NLLS fitting (+forward model),OG_MO_AUMC_ICR_RMH,"Oliver Gurney-Champion, Matthew Orton","Amsterdam University Medical Center, the Netherlands, Institute of Cancer Research, UK",fit_tofts_model,,ST/OGC,completed
+DCE,Pharmacokinetic models,[2-cmp exchange](../from src.original/OGJ_OsloU_NOR/MRImageAnalysis/DCE/Analyze.py),LLSQ fitting (+ forward model),OGJ_OsloU_NOR,Ole Gunnar Johansen,"University of Oslo, Norway","twoCXM, fitToModelLLSQ",,MJT,completed
+DCE,Pharmacokinetic models,[extended Tofts](../from src.original/OGJ_OsloU_NOR/MRImageAnalysis/DCE/Analyze.py),NLLS fitting (+ forward model),OGJ_OsloU_NOR,Ole Gunnar Johansen,"University of Oslo, Norway","ETM,  fitToModelNLLS, fitToModelNLLS_parallel",,ST/OGC,completed
+DCE,Pharmacokinetic models,[extended Tofts](../from src.original/OGJ_OsloU_NOR/MRImageAnalysis/DCE/Analyze.py),LLSQ fitting (+ forward model),OGJ_OsloU_NOR,Ole Gunnar Johansen,"University of Oslo, Norway","ETM, fitToModelLLSQ",,ST/OGC,completed
+DCE,Pharmacokinetic models,[Tofts](../from src.original/OGJ_OsloU_NOR/MRImageAnalysis/DCE/Analyze.py),NLLS fitting (+ forward model),OGJ_OsloU_NOR,Ole Gunnar Johansen,"University of Oslo, Norway","TM,  fitToModelNLLS, fitToModelNLLS_parallel",,ST/OGC,completed
+DCE,Pharmacokinetic models,[Tofts](../from src.original/OGJ_OsloU_NOR/MRImageAnalysis/DCE/Analyze.py),LLSQ fitting (+ forward model),OGJ_OsloU_NOR,Ole Gunnar Johansen,"University of Oslo, NOR","TM, fitToModelLLSQ",,ST/OGC,completed
+DCE,Pharmacokinetic models,[1-cmp](../from src.original/ST_USyd_AUS/ModelDictionary.py),forward model,ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia",OneCompartment,,tbd,
+DCE,Pharmacokinetic models,[dual-inlet 1-cmp](../from src.original/ST_USyd_AUS/ModelDictionary.py),forward model,ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia",DualInletOneCompartment,,tbd,
+DCE,Pharmacokinetic models,[dual-inlet ext Tofts](../from src.original/ST_USyd_AUS/ModelDictionary.py),forward model,ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia",DualInletExtendedTofts,,tbd,
+DCE,Pharmacokinetic models,[dual-inlet high-flow 2-cmp Gadoxetate](../from src.original/ST_USyd_AUS/ModelDictionary.py),forward model,ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia",DualInletconc_HF2CGM,,tbd,
+DCE,Pharmacokinetic models,[extended Tofts](../from src.original/ST_USyd_AUS/ModelDictionary.py),forward model,ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia",ExtendedTofts,,ST/OGC,completed
+DCE,Pharmacokinetic models,[Tofts](../from src.original/ST_USyd_AUS/ModelDictionary.py),forward model,ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia",Tofts,,ST/OGC,completed
+DCE,Pharmacokinetic models,[high flow 2-cmp Gadoxetate](../from src.original/ST_USyd_AUS/ModelDictionary.py),forward model,ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia",,,tbd,
+DCE,Pharmacokinetic models,[Patlak](../from src.original/ST_USyd_AUS/ModelDictionary.py),forward model,ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia",PatlakModel,,MJT,completed
+DCE,Signal to Concentration,[SPGR](../from src.original/DS_BW_VanderBiltUMC_USA/dcemri.py),"two-steps: S->R1, R1->C",DS_BW_VanderBiltUMC_USA,"David Smith, Brian Welch","VanderBilt University Medical Center, USA","r1eff_to_conc, dce_to_r1eff",,tbd,
+DCE,Signal to Concentration,[SPGR or GE-EPI](../from src.original/LCB_BNI_USA/dce.py),,LCB_BNI_USA,Laura Bell,"Barrow Neurological Institute, USA","signal_to_conc, estimate_delta_R1",,LK,completed
+DCE,Signal to concentration,[SPGR](../from src.original/LEK_UoEdinburgh_UK/SignalToConcentration/SI2Conc.py),"reverse C->S also available",LEK_UoEdinburgh,Lucy Kershaw,"University of Edinburgh, UK",SI2Conc,,LK,completed
+DCE,Signal to concentration,[SPGR](../from src.original/MB_QBI_UoManchester_UK/QbiPy/dce_models/tissue_concentration.py),"reverse C->S also available",MB_QBI_UoManchester_UK,Michael Berks,"University of Manchester, UK",signal_to_concentration,https://doi.org/10.21105/joss.03523,LK,completed
+DCE,Signal to concentration,[SPGR](../from src.original/MJT_UoEdinburgh_UK/dce_fit.py),"two steps: S-> enhancement, enhancement -> C; reverse C->S also available",MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK","sign_to_enh, enh_to_conc",,LK,completed
+DCE,Signal to concentration,[SPGR](../from src.original/OG_MO_AUMC_ICR_RMH_NL_UK/ExtendedTofts/DCE.py),"two steps: S->R1, R1 -> C; reverse C->S also available",OG_MO_AUMC_ICR_RMH,"Oliver Gurney-Champion, Matthew Orton","Amsterdam University Medical Center, the Netherlands, Institute of Cancer Research, UK","dce_to_r1eff, r1eff_to_conc",,LK,completed
+DCE,Signal to concentration,[SPGR](../from src.original/ST_USyd_AUS/signals2conc.py),"reverse R1->C also available",ST_USydAUS_DCE,Sirisha Tadimalla,"University of Sydney, Australia",signals2conc,,LK,completed
+DCE,T1,[VFA](../from src.original/DS_BW_VanderBiltUMC_USA/dcemri.py),nonlinear,DS_BW_VanderBiltUMC_USA,"David Smith, Brian Welch","VanderBilt University Medical Center, USA",fit_R1,,tbd,
+DCE,T1,[VFA](../from src.original/ZA_McGill_CAN/vfa.py),despot,McGill_VFA,Zaki Ahmed,"McGill University, Canada",despot,,MJT,completed
+DCE,T1,[VFA](../from src.original/ZA_McGill_CAN/vfa.py),novifast,McGill_VFA,Zaki Ahmed,"McGill University, Canada",novifast,,MJT,completed
+DCE,T1,[DESPOT1-HIFI](../from src.original/MJT_UoEdinburgh_UK/t1_fit.py),Fit any combination of (IR-)SPGR scans to estimate T1,MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK",HIFI,,MJT,in-progress
+DCE,T1,[VFA](../from src.original/MJT_UoEdinburgh_UK/t1_fit.py),linear,MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK",VFALinear,,MJT,complete
+DCE,T1,[VFA](../from src.original/MJT_UoEdinburgh_UK/t1_fit.py),nonlinear,MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK",VFANonlinear,,MJT,complete
+DCE,T1,[VFA](../from src.original/MJT_UoEdinburgh_UK/t1_fit.py),two flip angles,MJT_UoEdinburgh_UK,Michael Thrippleton,"University of Edinburgh, UK",VFA2Points,,tbd,
+DCE,T1,[VFA](../from src.original/OG_MO_AUMC_ICR_RMH_NL_UK/ExtendedTofts/DCE.py),two flip angles (linear),OG_MO_AUMC_ICR_RMH,"Oliver Gurney-Champion, Matthew Orton","Amsterdam University Medical Center, the Netherlands, Institute of Cancer Research, UK",R1_two_fas,,MJT,competed
+DCE,T1,[VFA](../from src.original/OG_MO_AUMC_ICR_RMH_NL_UK/ExtendedTofts/DCE.py),nonlinear,OG_MO_AUMC_ICR_RMH,"Oliver Gurney-Champion, Matthew Orton","Amsterdam University Medical Center, the Netherlands, Institute of Cancer Research, UK",R1_VFA,,MJT,competed
+DCE,T1,[VFA](../from src.original/ST_USyd_AUS/VFAT1mapping.py),linear,ST_Sydney_AUS_T1,Sirisha Tadimalla,"University of Sydney, Australia",VFAT1mapping,,MJT,completed
+DCE,T1,[VFA](../from src.original/ST_USyd_AUS/VFAT1mapping.py),nonlinear,ST_Sydney_AUS_T1,Sirisha Tadimalla,"University of Sydney, Australia",VFAT1mapping,,MJT,completed
+DCE/DSC,AIF deconvolution,[Volterra discretization with L-curve criterion](../from src.original/SR_TBG_BNIPhoenix_USA/AIFDeconvolution/AIF_deconvolution.py),,SR_TBG_BNI_PhoenixUSA,"Sudarshan Ragunathan, Laura Bell","Barrow Neurological Institute, USA",AIFdeconvolution,,JA,completed
+DCE/DSC,Miscellaneous,[calculate SNR](../from src.original/DS_BW_VanderBiltUMC_USA/dcemri.py),,DS_BW_VanderBiltUMC_USA,"David Smith, Brian Welch","VanderBilt University Medical Center, USA",signal_to_noise_ratio,,tbd,
+DCE/DSC,Miscellaneous,[calculate enhancement ratio](../from src.original/DS_BW_VanderBiltUMC_USA/dcemri.py),,DS_BW_VanderBiltUMC_USA,"David Smith, Brian Welch","VanderBilt University Medical Center, USA",signal_enhancement_ratio,,tbd,
+DSC,Input Functions,[automatic AIF selection](../from src.original/JBJA_GUSahlgrenska_SWE/AIF_selection_auto/AIF_selection_automatic.py),"fully automatic, semi-automatic",JBJA_GUSahlgrenskaSWE,"Jesper Browall, Jonathan Arvidsson","Sahlgrenska University Hospital and Gothenburg University, Gothenburg, Sweden",AIF_selection_automatic.py,DOI: 10.1002/mrm.20759,tbd,
+DSC,Leakage correction,[BSW](../from src.original/SR_TBG_BNIPhoenix_USA/LeakageCorrection/bsw_leakagecorr.py),,SR_TBG_BNI_PhoenixUSA,"Sudarshan Ragunathan, Laura Bell","Barrow Neurological Institute, USA",BSWleakagecorr,,SR,in-progress
+DSC,Parameter derivation,"[CBV,CBF,MTT](../from src.original/SR_TBG_BNIPhoenix_USA/DSCparameters/DSC_parameters.py)",,SR_TBG_BNI_PhoenixUSA,"Sudarshan Ragunathan, Laura Bell","Barrow Neurological Institute, USA",DSCparameters,,tbd,
+DSC,Signal to deltaR2*,[single echo](../from src.original/LCB_BNI_USA/dsc.py),,LCB_BNI_USA,Laura Bell,"Barrow Neurological Institute, USA",,estimate_delta_R2s,tbd,
+DSC,Signal to deltaR2*,[dual echo](../from src.original/LCB_BNI_USA/dsc.py),,LCB_BNI_USA,Laura Bell,"Barrow Neurological Institute, USA",,"estimate_delta_R2s, estimate_delta_R2s_dual_echo",tbd,
+DSC,Signal to R2*,[dual echo](../from src.original/LCB_BNI_USA/dsc.py),,LCB_BNI_USA,Laura Bell,"Barrow Neurological Institute, USA",,estimate_R2s,tbd,
\ No newline at end of file
diff --git a/notebooks/old_nb/DCE_ToftsModel.ipynb b/notebooks/old_nb/DCE_ToftsModel.ipynb
index 6f81294f..42459b03 100644
--- a/notebooks/old_nb/DCE_ToftsModel.ipynb
+++ b/notebooks/old_nb/DCE_ToftsModel.ipynb
@@ -41,8 +41,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from osipi_code_collection.wrappers.tofts import tofts_fit, show_maps, show_error_maps\n",
-    "from osipi_code_collection.utils.nb import download_osf, loadmat"
+    "src.wrappers.tofts import tofts_fit, show_maps, show_error_maps\n",
+    "src.utils.nb import download_osf, loadmat"
    ]
   },
   {
diff --git a/notebooks/old_nb/T1mapping_QIBAv1.ipynb b/notebooks/old_nb/T1mapping_QIBAv1.ipynb
index ddac9025..79516a50 100644
--- a/notebooks/old_nb/T1mapping_QIBAv1.ipynb
+++ b/notebooks/old_nb/T1mapping_QIBAv1.ipynb
@@ -50,8 +50,8 @@
     }
    ],
    "source": [
-    "from osipi_code_collection.wrappers.vfa import vfa_fit, show_maps, show_error_maps\n",
-    "from osipi_code_collection.utils.nb import download_osf, loadmat\n",
+    "src.wrappers.vfa import vfa_fit, show_maps, show_error_maps\n",
+    "src.utils.nb import download_osf, loadmat\n",
     "\n",
     "vfafile = \"./data/vfadata.mat\"\n",
     "download_osf(\"https://osf.io/jzu4k/download\", vfafile)\n",
diff --git a/notebooks/old_nb/T1mapping_QIBAv2.ipynb b/notebooks/old_nb/T1mapping_QIBAv2.ipynb
index 2b1d2cec..1d7826cc 100644
--- a/notebooks/old_nb/T1mapping_QIBAv2.ipynb
+++ b/notebooks/old_nb/T1mapping_QIBAv2.ipynb
@@ -43,8 +43,8 @@
    },
    "outputs": [],
    "source": [
-    "from osipi_code_collection.wrappers.vfa import vfa_fit, show_error_maps\n",
-    "from osipi_code_collection.utils.nb import download_osf, loadmat, make_error_map_gif\n",
+    "src.wrappers.vfa import vfa_fit, show_error_maps\n",
+    "src.utils.nb import download_osf, loadmat, make_error_map_gif\n",
     "\n",
     "vfafile = \"./data/vfadata_noisy.mat\"\n",
     "download_osf(\"https://osf.io/3hwtc/download\", vfafile)\n",
diff --git a/setup.py b/setup.py
index 513933f0..84ecc5e0 100644
--- a/setup.py
+++ b/setup.py
@@ -3,10 +3,10 @@
 setup(
     name='osipi_code_collection',
     version='0.0.2',
-    install_requires=['dicom==0.9.9.post1', 'imageio==2.19.3', 'joblib==1.1.0', 'lmfit==1.0.3',
-                      'mat73==0.59', 'matplotlib==3.5.2', 'nibabel==3.2.2', 'numpy==1.23.0rc2',
+    install_requires=['imageio==2.19.3', 'joblib==1.1.0', 'lmfit==1.0.3',
+                      'mat73==0.59', 'matplotlib==3.5.2', 'nibabel==3.2.2', 'numpy>=1.23.0',
                       'opencv-python==4.5.5.64', 'openpyxl==3.2.0b1', 'pandas==1.4.2',
-                      'progressbar==2.5', 'pytest==7.1.2', 'scipy==1.8.1'],
+                      'progressbar==2.5', 'pytest==7.1.2', 'scipy==1.8.1','pydicom'],
     include_package_data=True,
     package_dir={'osipi_code_collection': 'src'},
     packages=[f'osipi_code_collection.{module}' for module in find_packages('src')],
diff --git a/src/original/OGJ_OsloU_NOR/MRImageAnalysis/io.py b/src/original/OGJ_OsloU_NOR/MRImageAnalysis/io.py
index 3c18d228..20de9a66 100644
--- a/src/original/OGJ_OsloU_NOR/MRImageAnalysis/io.py
+++ b/src/original/OGJ_OsloU_NOR/MRImageAnalysis/io.py
@@ -1,4 +1,5 @@
-import dicom, dicom.UID
+import pydicom as dicom
+import pydicom.uid
 from dicom.dataset import Dataset, FileDataset
 import datetime, time
 import os
diff --git a/src/wrappers/tofts.py b/src/wrappers/tofts.py
index ad87305e..4f3e3d85 100644
--- a/src/wrappers/tofts.py
+++ b/src/wrappers/tofts.py
@@ -4,16 +4,16 @@
 from operator import itemgetter, attrgetter
 from scipy.optimize import curve_fit
 # osipi utilities
-from osipi_code_collection.utils.nb import percenterror
+src.utils.nb import percenterror
 # osipi implementations
-import osipi_code_collection.original.LEK_UoEdinburgh_UK.PharmacokineticModelling.models as edinburgh1
-import osipi_code_collection.original.MJT_UoEdinburgh_UK.aifs as edinburgh2_aifs
-import osipi_code_collection.original.MJT_UoEdinburgh_UK.pk_models as edinburgh2_models
-import osipi_code_collection.original.MJT_UoEdinburgh_UK.dce_fit as edinburgh2_fit
-import osipi_code_collection.original.OGJ_OsloU_NOR.MRImageAnalysis.DCE.Analyze as oslo
-import osipi_code_collection.original.ST_USydAUS.ModelDictionary as sydney
-from osipi_code_collection.original.MB_QBI_UoManchester_UK.QbiPy.dce_models import dce_aif as manchester_aif
-from osipi_code_collection.original.MB_QBI_UoManchester_UK.QbiPy.dce_models import tofts_model as manchester_tofts
+import src.original.LEK_UoEdinburgh_UK.PharmacokineticModelling.models as edinburgh1
+import src.original.MJT_UoEdinburgh_UK.aifs as edinburgh2_aifs
+import src.original.MJT_UoEdinburgh_UK.pk_models as edinburgh2_models
+import src.original.MJT_UoEdinburgh_UK.dce_fit as edinburgh2_fit
+import src.original.OGJ_OsloU_NOR.MRImageAnalysis.DCE.Analyze as oslo
+import src.original.ST_USydAUS.ModelDictionary as sydney
+from src.original.MB_QBI_UoManchester_UK.QbiPy.dce_models import dce_aif as manchester_aif
+from src.original.MB_QBI_UoManchester_UK.QbiPy.dce_models import tofts_model as manchester_tofts
 import osipi_code_collection.original.OG_MO_AUMC_ICR_RMH_NL_UK.ExtendedTofts.DCE as amsterdam
 
 def tofts_fit(author, ct = None, ca = None, t = None, fittype = "linear", mask = None, data = None):
diff --git a/src/wrappers/vfa.py b/src/wrappers/vfa.py
index d4b3fbe4..729b9089 100644
--- a/src/wrappers/vfa.py
+++ b/src/wrappers/vfa.py
@@ -1,7 +1,7 @@
-import osipi_code_collection.original.MJT_UoEdinburgh_UK.t1_fit as edinburgh
-import osipi_code_collection.original.ST_USydAUS.VFAT1mapping as sydney
-import osipi_code_collection.original.McGill_CAN.vfa as mcgill
-from osipi_code_collection.utils.nb import percenterror
+import src.original.MJT_UoEdinburgh_UK.t1_fit as edinburgh
+import src.original.ST_USydAUS.VFAT1mapping as sydney
+import src.original.McGill_CAN.vfa as mcgill
+src.utils.nb import percenterror
 import matplotlib.pyplot as plt
 import numpy as np
 
diff --git a/test/DCEmodels/test_DCEmodels_etofts_LEK_UoEdinburgh_UK.py b/test/DCEmodels/test_DCEmodels_etofts_LEK_UoEdinburgh_UK.py
index 36150a1e..8dd9394a 100644
--- a/test/DCEmodels/test_DCEmodels_etofts_LEK_UoEdinburgh_UK.py
+++ b/test/DCEmodels/test_DCEmodels_etofts_LEK_UoEdinburgh_UK.py
@@ -4,7 +4,7 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
 from . import DCEmodels_data
-from osipi_code_collection.original.LEK_UoEdinburgh_UK.PharmacokineticModelling.models import ExtKety
+from src.original.LEK_UoEdinburgh_UK.PharmacokineticModelling.models import ExtKety
 
 # All tests will use the same arguments and same data...
 arg_names = 'label, t_array, C_array, ca_array, ta_array, ve_ref, vp_ref, Ktrans_ref, arterial_delay_ref, a_tol_ve, ' \
diff --git a/test/DCEmodels/test_DCEmodels_etofts_MB_QBI_UoManchester_UK.py b/test/DCEmodels/test_DCEmodels_etofts_MB_QBI_UoManchester_UK.py
index 92bd38ce..7da4a004 100644
--- a/test/DCEmodels/test_DCEmodels_etofts_MB_QBI_UoManchester_UK.py
+++ b/test/DCEmodels/test_DCEmodels_etofts_MB_QBI_UoManchester_UK.py
@@ -3,7 +3,7 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
 from . import DCEmodels_data
-from osipi_code_collection.original.MB_QBI_UoManchester_UK.QbiPy.dce_models import tofts_model, dce_aif
+from src.original.MB_QBI_UoManchester_UK.QbiPy.dce_models import tofts_model, dce_aif
 
 # All tests will use the same arguments and same data...
 arg_names = 'label, t_array, C_array, ca_array, ta_array, ve_ref, vp_ref, Ktrans_ref, arterial_delay_ref,  a_tol_ve, ' \
diff --git a/test/DCEmodels/test_DCEmodels_etofts_MJT_UoEdinburgh_UK.py b/test/DCEmodels/test_DCEmodels_etofts_MJT_UoEdinburgh_UK.py
index 6d3b2d22..8dd17bf6 100644
--- a/test/DCEmodels/test_DCEmodels_etofts_MJT_UoEdinburgh_UK.py
+++ b/test/DCEmodels/test_DCEmodels_etofts_MJT_UoEdinburgh_UK.py
@@ -3,7 +3,7 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
 from . import DCEmodels_data
-from osipi_code_collection.original.MJT_UoEdinburgh_UK import dce_fit, pk_models, aifs
+from src.original.MJT_UoEdinburgh_UK import dce_fit, pk_models, aifs
 
 # All tests will use the same arguments and same data...
 arg_names = 'label, t_array, C_array, ca_array, ta_array, ve_ref, vp_ref, Ktrans_ref, arterial_delay_ref,  a_tol_ve, ' \
diff --git a/test/DCEmodels/test_DCEmodels_etofts_OGJ_OsloU_NOR.py b/test/DCEmodels/test_DCEmodels_etofts_OGJ_OsloU_NOR.py
index 463b299c..ae3347e8 100644
--- a/test/DCEmodels/test_DCEmodels_etofts_OGJ_OsloU_NOR.py
+++ b/test/DCEmodels/test_DCEmodels_etofts_OGJ_OsloU_NOR.py
@@ -3,7 +3,7 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
 from . import DCEmodels_data
-from osipi_code_collection.original.OGJ_OsloU_NOR.MRImageAnalysis.DCE.Analyze \
+from src.original.OGJ_OsloU_NOR.MRImageAnalysis.DCE.Analyze \
     import fitToModel
 
 # All tests will use the same arguments and same data...
diff --git a/test/DCEmodels/test_DCEmodels_etofts_OG_MO_AUMC_ICR_RMH_NL_UK.py b/test/DCEmodels/test_DCEmodels_etofts_OG_MO_AUMC_ICR_RMH_NL_UK.py
index 133c4d57..10b123ef 100644
--- a/test/DCEmodels/test_DCEmodels_etofts_OG_MO_AUMC_ICR_RMH_NL_UK.py
+++ b/test/DCEmodels/test_DCEmodels_etofts_OG_MO_AUMC_ICR_RMH_NL_UK.py
@@ -3,7 +3,7 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
 from . import DCEmodels_data
-from osipi_code_collection.original.OG_MO_AUMC_ICR_RMH_NL_UK.ExtendedTofts.DCE \
+from src.original.OG_MO_AUMC_ICR_RMH_NL_UK.ExtendedTofts.DCE \
     import \
     fit_tofts_model, fit_aif
 
diff --git a/test/DCEmodels/test_DCEmodels_etofts_ST_USyd_AUS.py b/test/DCEmodels/test_DCEmodels_etofts_ST_USyd_AUS.py
index c834ae99..367423d9 100644
--- a/test/DCEmodels/test_DCEmodels_etofts_ST_USyd_AUS.py
+++ b/test/DCEmodels/test_DCEmodels_etofts_ST_USyd_AUS.py
@@ -4,7 +4,7 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
 from . import DCEmodels_data
-from osipi_code_collection.original.ST_USyd_AUS.ModelDictionary import ExtendedTofts
+from src.original.ST_USyd_AUS.ModelDictionary import ExtendedTofts
 
 # All tests will use the same arguments and same data...
 arg_names = 'label, t_array, C_array, ca_array, ta_array, ve_ref, vp_ref, Ktrans_ref, arterial_delay_ref,  a_tol_ve, ' \
diff --git a/test/DCEmodels/test_DCEmodels_tofts_LCB_BNI_USA.py b/test/DCEmodels/test_DCEmodels_tofts_LCB_BNI_USA.py
index 0b190ce1..5ebf1e4a 100644
--- a/test/DCEmodels/test_DCEmodels_tofts_LCB_BNI_USA.py
+++ b/test/DCEmodels/test_DCEmodels_tofts_LCB_BNI_USA.py
@@ -3,7 +3,7 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
 from . import DCEmodels_data
-from osipi_code_collection.original.LCB_BNI_USA.dce import fit_tofts
+from src.original.LCB_BNI_USA.dce import fit_tofts
 
 arg_names = 'label, t_array, C_array, ca_array, ta_array, ve_ref, Ktrans_ref, arterial_delay_ref, a_tol_ve, r_tol_ve, ' \
             'a_tol_Ktrans, r_tol_Ktrans, a_tol_delay, r_tol_delay '
diff --git a/test/DCEmodels/test_DCEmodels_tofts_LEK_UoEdinburgh_UK.py b/test/DCEmodels/test_DCEmodels_tofts_LEK_UoEdinburgh_UK.py
index a3133e20..f331a142 100644
--- a/test/DCEmodels/test_DCEmodels_tofts_LEK_UoEdinburgh_UK.py
+++ b/test/DCEmodels/test_DCEmodels_tofts_LEK_UoEdinburgh_UK.py
@@ -4,7 +4,7 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
 from . import DCEmodels_data
-from osipi_code_collection.original.LEK_UoEdinburgh_UK.PharmacokineticModelling.models import ExtKety, Kety
+from src.original.LEK_UoEdinburgh_UK.PharmacokineticModelling.models import ExtKety, Kety
 
 arg_names = 'label, t_array, C_array, ca_array, ta_array, ve_ref, Ktrans_ref, arterial_delay_ref,  a_tol_ve, ' \
             'r_tol_ve, a_tol_Ktrans, r_tol_Ktrans, a_tol_delay, r_tol_delay'
diff --git a/test/DCEmodels/test_DCEmodels_tofts_MJT_UoEdinburgh_UK.py b/test/DCEmodels/test_DCEmodels_tofts_MJT_UoEdinburgh_UK.py
index e46e1016..5d68b041 100644
--- a/test/DCEmodels/test_DCEmodels_tofts_MJT_UoEdinburgh_UK.py
+++ b/test/DCEmodels/test_DCEmodels_tofts_MJT_UoEdinburgh_UK.py
@@ -3,7 +3,7 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
 from . import DCEmodels_data
-from osipi_code_collection.original.MJT_UoEdinburgh_UK import dce_fit, pk_models, aifs
+from src.original.MJT_UoEdinburgh_UK import dce_fit, pk_models, aifs
 
 arg_names = 'label, t_array, C_array, ca_array, ta_array, ve_ref, Ktrans_ref, arterial_delay_ref,  a_tol_ve, ' \
             'r_tol_ve, a_tol_Ktrans,r_tol_Ktrans,a_tol_delay,r_tol_delay '
diff --git a/test/DCEmodels/test_DCEmodels_tofts_OGJ_OsloU_NOR.py b/test/DCEmodels/test_DCEmodels_tofts_OGJ_OsloU_NOR.py
index d08c3def..1dddfb7d 100644
--- a/test/DCEmodels/test_DCEmodels_tofts_OGJ_OsloU_NOR.py
+++ b/test/DCEmodels/test_DCEmodels_tofts_OGJ_OsloU_NOR.py
@@ -3,7 +3,7 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
 from . import DCEmodels_data
-from osipi_code_collection.original.OGJ_OsloU_NOR.MRImageAnalysis.DCE.Analyze import fitToModel
+from src.original.OGJ_OsloU_NOR.MRImageAnalysis.DCE.Analyze import fitToModel
 
 # All tests will use the same arguments and same data...
 arg_names = 'label, t_array, C_array, ca_array, ta_array, ve_ref, Ktrans_ref, arterial_delay_ref,  a_tol_ve, ' \
diff --git a/test/DCEmodels/test_DCEmodels_tofts_ST_USyd_AUS.py b/test/DCEmodels/test_DCEmodels_tofts_ST_USyd_AUS.py
index 95246261..54503eb1 100644
--- a/test/DCEmodels/test_DCEmodels_tofts_ST_USyd_AUS.py
+++ b/test/DCEmodels/test_DCEmodels_tofts_ST_USyd_AUS.py
@@ -4,7 +4,7 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
 from . import DCEmodels_data
-from osipi_code_collection.original.ST_USyd_AUS.ModelDictionary import Tofts
+from src.original.ST_USyd_AUS.ModelDictionary import Tofts
 
 arg_names = 'label, t_array, C_array, ca_array, ta_array, ve_ref, Ktrans_ref, arterial_delay_ref,  a_tol_ve, ' \
             'r_tol_ve, a_tol_Ktrans,r_tol_Ktrans,a_tol_delay,r_tol_delay '
diff --git a/test/PopulationAIF_DCE/test_popAIF_Georgiou_PvH_NKI_NL.py b/test/PopulationAIF_DCE/test_popAIF_Georgiou_PvH_NKI_NL.py
index dccfe55a..fb825033 100644
--- a/test/PopulationAIF_DCE/test_popAIF_Georgiou_PvH_NKI_NL.py
+++ b/test/PopulationAIF_DCE/test_popAIF_Georgiou_PvH_NKI_NL.py
@@ -3,7 +3,7 @@
 import numpy as np
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
-from osipi_code_collection.original.PvH_NKI_NL.AIF.PopulationAIF import GeorgiouAIF
+from src.original.PvH_NKI_NL.AIF.PopulationAIF import GeorgiouAIF
 from . import popAIF_data
 
 
diff --git a/test/PopulationAIF_DCE/test_popAIF_Parker_MB_QBI_UoManchester_UK.py b/test/PopulationAIF_DCE/test_popAIF_Parker_MB_QBI_UoManchester_UK.py
index f5cb004c..d54637fd 100644
--- a/test/PopulationAIF_DCE/test_popAIF_Parker_MB_QBI_UoManchester_UK.py
+++ b/test/PopulationAIF_DCE/test_popAIF_Parker_MB_QBI_UoManchester_UK.py
@@ -3,7 +3,7 @@
 import numpy as np
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
-import osipi_code_collection.original.MB_QBI_UoManchester_UK.QbiPy.dce_models.dce_aif as dce_aif
+import src.original.MB_QBI_UoManchester_UK.QbiPy.dce_models.dce_aif as dce_aif
 from . import popAIF_data
 
 
diff --git a/test/PopulationAIF_DCE/test_popAIF_Parker_MJT_Edinburgh_UK.py b/test/PopulationAIF_DCE/test_popAIF_Parker_MJT_Edinburgh_UK.py
index 22ba7f67..4ea285de 100644
--- a/test/PopulationAIF_DCE/test_popAIF_Parker_MJT_Edinburgh_UK.py
+++ b/test/PopulationAIF_DCE/test_popAIF_Parker_MJT_Edinburgh_UK.py
@@ -2,7 +2,7 @@
 import numpy as np
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
-import osipi_code_collection.original.MJT_UoEdinburgh_UK.aifs as aifs
+import src.original.MJT_UoEdinburgh_UK.aifs as aifs
 from . import popAIF_data
 
 
diff --git a/test/PopulationAIF_DCE/test_popAIF_Parker_PvH_NKI_NL.py b/test/PopulationAIF_DCE/test_popAIF_Parker_PvH_NKI_NL.py
index 09b17a9b..2ac201ae 100644
--- a/test/PopulationAIF_DCE/test_popAIF_Parker_PvH_NKI_NL.py
+++ b/test/PopulationAIF_DCE/test_popAIF_Parker_PvH_NKI_NL.py
@@ -3,7 +3,7 @@
 import numpy as np
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
-from osipi_code_collection.original.PvH_NKI_NL.AIF.PopulationAIF import ParkerAIF
+from src.original.PvH_NKI_NL.AIF.PopulationAIF import ParkerAIF
 from . import popAIF_data
 
 
diff --git a/test/PopulationAIF_DCE/test_popAIF_Parker_ST_USyd_AUS.py b/test/PopulationAIF_DCE/test_popAIF_Parker_ST_USyd_AUS.py
index 3eaf455a..ccbbcaaf 100644
--- a/test/PopulationAIF_DCE/test_popAIF_Parker_ST_USyd_AUS.py
+++ b/test/PopulationAIF_DCE/test_popAIF_Parker_ST_USyd_AUS.py
@@ -3,7 +3,7 @@
 import numpy as np
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
-from osipi_code_collection.original.ST_USyd_AUS.InputFunctions import AIF, variableAIF, arr_shift
+from src.original.ST_USyd_AUS.InputFunctions import AIF, variableAIF, arr_shift
 from . import popAIF_data
 
 
diff --git a/test/PopulationAIF_DCE/test_popAIF_preclinical_ST_USyd_AUS.py b/test/PopulationAIF_DCE/test_popAIF_preclinical_ST_USyd_AUS.py
index 0830680c..2a911959 100644
--- a/test/PopulationAIF_DCE/test_popAIF_preclinical_ST_USyd_AUS.py
+++ b/test/PopulationAIF_DCE/test_popAIF_preclinical_ST_USyd_AUS.py
@@ -3,7 +3,7 @@
 import numpy as np
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
-from osipi_code_collection.original.ST_USyd_AUS.InputFunctions import preclinicalAIF
+from src.original.ST_USyd_AUS.InputFunctions import preclinicalAIF
 from . import popAIF_data
 
 
diff --git a/test/SI_to_Conc/test_SI2Conc_LCB_BNI_USA.py b/test/SI_to_Conc/test_SI2Conc_LCB_BNI_USA.py
index 06ffc8c2..6679a123 100644
--- a/test/SI_to_Conc/test_SI2Conc_LCB_BNI_USA.py
+++ b/test/SI_to_Conc/test_SI2Conc_LCB_BNI_USA.py
@@ -4,7 +4,7 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
 from . import SI2Conc_data
-from osipi_code_collection.original.LCB_BNI_USA.dce import signal_to_conc
+from src.original.LCB_BNI_USA.dce import signal_to_conc
 
 
 # All tests will use the same arguments and same data...
diff --git a/test/SI_to_Conc/test_SI2Conc_LEK_Edinburgh_UK.py b/test/SI_to_Conc/test_SI2Conc_LEK_Edinburgh_UK.py
index 71e180a2..af6e4660 100644
--- a/test/SI_to_Conc/test_SI2Conc_LEK_Edinburgh_UK.py
+++ b/test/SI_to_Conc/test_SI2Conc_LEK_Edinburgh_UK.py
@@ -4,7 +4,7 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
 from . import SI2Conc_data
-from osipi_code_collection.original.LEK_UoEdinburgh_UK.SignalToConcentration import SI2Conc
+from src.original.LEK_UoEdinburgh_UK.SignalToConcentration import SI2Conc
 
 
 # All tests will use the same arguments and same data...
diff --git a/test/SI_to_Conc/test_SI2Conc_MB_QBI_UoManchester_UK.py b/test/SI_to_Conc/test_SI2Conc_MB_QBI_UoManchester_UK.py
index 4ece4669..a6e08d77 100644
--- a/test/SI_to_Conc/test_SI2Conc_MB_QBI_UoManchester_UK.py
+++ b/test/SI_to_Conc/test_SI2Conc_MB_QBI_UoManchester_UK.py
@@ -4,7 +4,7 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
 from . import SI2Conc_data
-from osipi_code_collection.original.MB_QBI_UoManchester_UK.QbiPy.dce_models.tissue_concentration import signal_to_concentration
+from src.original.MB_QBI_UoManchester_UK.QbiPy.dce_models.tissue_concentration import signal_to_concentration
 
 
 
diff --git a/test/SI_to_Conc/test_SI2Conc_MJT_UoEdinburgh_UK.py b/test/SI_to_Conc/test_SI2Conc_MJT_UoEdinburgh_UK.py
index 0ab0e93a..c1241069 100644
--- a/test/SI_to_Conc/test_SI2Conc_MJT_UoEdinburgh_UK.py
+++ b/test/SI_to_Conc/test_SI2Conc_MJT_UoEdinburgh_UK.py
@@ -3,10 +3,10 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
 from . import SI2Conc_data
-from osipi_code_collection.original.MJT_UoEdinburgh_UK.signal_models import SPGR
-from osipi_code_collection.original.MJT_UoEdinburgh_UK.relaxivity import CRLinear
-from osipi_code_collection.original.MJT_UoEdinburgh_UK.dce_fit import SigToEnh
-from osipi_code_collection.original.MJT_UoEdinburgh_UK.dce_fit import EnhToConc, EnhToConcSPGR
+from src.original.MJT_UoEdinburgh_UK.signal_models import SPGR
+from src.original.MJT_UoEdinburgh_UK.relaxivity import CRLinear
+from src.original.MJT_UoEdinburgh_UK.dce_fit import SigToEnh
+from src.original.MJT_UoEdinburgh_UK.dce_fit import EnhToConc, EnhToConcSPGR
 
 
 # All tests will use the same arguments and same data...
diff --git a/test/SI_to_Conc/test_SI2Conc_OG_MO_AUMC_ICR_RMH_NL_UK.py b/test/SI_to_Conc/test_SI2Conc_OG_MO_AUMC_ICR_RMH_NL_UK.py
index 9d82ab45..856042db 100644
--- a/test/SI_to_Conc/test_SI2Conc_OG_MO_AUMC_ICR_RMH_NL_UK.py
+++ b/test/SI_to_Conc/test_SI2Conc_OG_MO_AUMC_ICR_RMH_NL_UK.py
@@ -4,8 +4,8 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
 from . import SI2Conc_data
-from osipi_code_collection.original.OG_MO_AUMC_ICR_RMH_NL_UK.ExtendedTofts.DCE import dce_to_r1eff
-from osipi_code_collection.original.OG_MO_AUMC_ICR_RMH_NL_UK.ExtendedTofts.DCE import r1eff_to_conc
+from src.original.OG_MO_AUMC_ICR_RMH_NL_UK.ExtendedTofts.DCE import dce_to_r1eff
+from src.original.OG_MO_AUMC_ICR_RMH_NL_UK.ExtendedTofts.DCE import r1eff_to_conc
 
 
 
diff --git a/test/SI_to_Conc/test_SI2Conc_ST_USyd_AUS.py b/test/SI_to_Conc/test_SI2Conc_ST_USyd_AUS.py
index c0cbc343..9ed3d434 100644
--- a/test/SI_to_Conc/test_SI2Conc_ST_USyd_AUS.py
+++ b/test/SI_to_Conc/test_SI2Conc_ST_USyd_AUS.py
@@ -4,7 +4,7 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
 from . import SI2Conc_data
-from osipi_code_collection.original.ST_USyd_AUS.signals2conc import signals2conc
+from src.original.ST_USyd_AUS.signals2conc import signals2conc
 
 
 # All tests will use the same arguments and same data...
diff --git a/test/T1_mapping/test_t1_MJT_Edinburgh_UK.py b/test/T1_mapping/test_t1_MJT_Edinburgh_UK.py
index 059ea8a3..f2cb2072 100644
--- a/test/T1_mapping/test_t1_MJT_Edinburgh_UK.py
+++ b/test/T1_mapping/test_t1_MJT_Edinburgh_UK.py
@@ -4,7 +4,7 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
 from . import t1_data
-from osipi_code_collection.original.MJT_UoEdinburgh_UK.t1_fit import VFALinear, VFANonLinear, VFA2Points
+from src.original.MJT_UoEdinburgh_UK.t1_fit import VFALinear, VFANonLinear, VFA2Points
 
 
 # All tests will use the same arguments and same data...
diff --git a/test/T1_mapping/test_t1_OG_MO_AUMC_ICR_RMH_NL_UK.py b/test/T1_mapping/test_t1_OG_MO_AUMC_ICR_RMH_NL_UK.py
index 2107f579..79a295b6 100644
--- a/test/T1_mapping/test_t1_OG_MO_AUMC_ICR_RMH_NL_UK.py
+++ b/test/T1_mapping/test_t1_OG_MO_AUMC_ICR_RMH_NL_UK.py
@@ -4,7 +4,7 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
 from . import t1_data
-from osipi_code_collection.original.OG_MO_AUMC_ICR_RMH_NL_UK.ExtendedTofts.DCE import R1_two_fas, R1_VFA
+from src.original.OG_MO_AUMC_ICR_RMH_NL_UK.ExtendedTofts.DCE import R1_two_fas, R1_VFA
 
 
 # All tests will use the same arguments and same data...
diff --git a/test/T1_mapping/test_t1_ST_USyd_AUS.py b/test/T1_mapping/test_t1_ST_USyd_AUS.py
index fc3ec846..e8e935ed 100644
--- a/test/T1_mapping/test_t1_ST_USyd_AUS.py
+++ b/test/T1_mapping/test_t1_ST_USyd_AUS.py
@@ -4,7 +4,7 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results # helper for running tests on multiple cases
 from . import t1_data # module for providing all t1 test cases
-from osipi_code_collection.original.ST_USyd_AUS.VFAT1mapping import VFAT1mapping # functions to test
+from src.original.ST_USyd_AUS.VFAT1mapping import VFAT1mapping # functions to test
 
 
 # All tests will use the same arguments and same data...
diff --git a/test/T1_mapping/test_t1_ZA_McGill_CAN.py b/test/T1_mapping/test_t1_ZA_McGill_CAN.py
index 770cce37..9bfb42cf 100644
--- a/test/T1_mapping/test_t1_ZA_McGill_CAN.py
+++ b/test/T1_mapping/test_t1_ZA_McGill_CAN.py
@@ -4,7 +4,7 @@
 from time import perf_counter
 from ..helpers import osipi_parametrize, log_init, log_results
 from . import t1_data
-from osipi_code_collection.original.ZA_McGill_CAN.vfa import despot, novifast
+from src.original.ZA_McGill_CAN.vfa import despot, novifast
 
 
 # All tests will use the same arguments and same data...