Added cleanup script, new measurements will be moved to rand folder
fixed incrementation of MEASUREMENT variable