Reorganised script folder
Merge branch 'Ronan' into develop