Update folder structure to prepare for RTD testing1