more rscripts
more restructuring